Packman Build Service PMBS

obs-studio.changes Changed

@@ -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:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-18.0.1.tar.xz/CONTRIBUTING Deleted

@@ -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.

obs-studio-18.0.1.tar.xz/README Deleted

@@ -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).

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/captions-stream.cpp Deleted

@@ -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);

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/captions-stream.hpp Deleted

@@ -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;
-};

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/amf-h264.h Deleted

@@ -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();

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/amf-h264.cpp Deleted

@@ -1,2180 +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.
-*/
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include <chrono>
-
-#include "amf-capabilities.h"
-#include "amf-h264.h"
-#include "misc-util.cpp"
-#include "api-base.h"
-
-// AMF
-#include "components/VideoEncoderVCE.h"
-#include "components/VideoConverter.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-
-#define AMF_PROPERTY_FRAME L"Frame"
-#define AMF_PROPERTY_TIME_SENDINPUT L"TimeSendInput"
-#define AMF_PROPERTY_TIME_CREATESURFACE L"TimeCreateSurface"
-#define AMF_PROPERTY_TIME_CONVERT L"TimeConvert"
-#define AMF_PROPERTY_TIME_ENCODE L"TimeEncode"
-
-// Logging and Exception Helpers
-static void FormatTextWithAMFError(std::vector<char>* buffer, const char* format, AMF_RESULT res) {
-	sprintf(buffer->data(), format, Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);
-}
-
-template<typename _T>
-static void FormatTextWithAMFError(std::vector<char>* buffer, const char* format, _T other, AMF_RESULT res) {
-	sprintf(buffer->data(), format, other, Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);
-}
-
-// Class
-#ifdef _DEBUG
-static void fastPrintVariant(const char* text, amf::AMFVariantStruct variant) {
-	std::vector<char> buf(1024);
-	switch (variant.type) {
-		case amf::AMF_VARIANT_EMPTY:
-			sprintf(buf.data(), "%s%s", text, "Empty");
-			break;
-		case amf::AMF_VARIANT_BOOL:
-			sprintf(buf.data(), "%s%s", text, variant.boolValue ? "true" : "false");
-			break;
-		case amf::AMF_VARIANT_INT64:
-			sprintf(buf.data(), "%s%lld", text, variant.int64Value);
-			break;
-		case amf::AMF_VARIANT_DOUBLE:
-			sprintf(buf.data(), "%s%f", text, variant.doubleValue);
-			break;
-		case amf::AMF_VARIANT_RECT:
-			sprintf(buf.data(), "%s[%ld,%ld,%ld,%ld]", text,
-				variant.rectValue.top, variant.rectValue.left,
-				variant.rectValue.bottom, variant.rectValue.right);
-			break;
-		case amf::AMF_VARIANT_SIZE:
-			sprintf(buf.data(), "%s%ldx%ld", text,
-				variant.sizeValue.width, variant.sizeValue.height);
-			break;
-		case amf::AMF_VARIANT_POINT:
-			sprintf(buf.data(), "%s[%ld,%ld]", text,
-				variant.pointValue.x, variant.pointValue.y);
-			break;
-		case amf::AMF_VARIANT_RATE:
-			sprintf(buf.data(), "%s%ld/%ld", text,
-				variant.rateValue.num, variant.rateValue.den);
-			break;
-		case amf::AMF_VARIANT_RATIO:
-			sprintf(buf.data(), "%s%ld:%ld", text,
-				variant.ratioValue.num, variant.ratioValue.den);
-			break;
-		case amf::AMF_VARIANT_COLOR:
-			sprintf(buf.data(), "%s(%d,%d,%d,%d)", text,
-				variant.colorValue.r,
-				variant.colorValue.g,
-				variant.colorValue.b,
-				variant.colorValue.a);
-			break;
-		case amf::AMF_VARIANT_STRING:
-			sprintf(buf.data(), "%s'%s'", text,
-				variant.stringValue);
-			break;
-		case amf::AMF_VARIANT_WSTRING:
-			sprintf(buf.data(), "%s'%ls'", text,
-				variant.wstringValue);
-			break;
-	}
-	AMF_LOG_INFO("%s", buf.data());
-};
-
-static void printDebugInfo(amf::AMFComponentPtr m_AMFEncoder) {
-	amf::AMFPropertyInfo* pInfo;
-	size_t propCount = m_AMFEncoder->GetPropertyCount();
-	AMF_LOG_INFO("-- Internal AMF Encoder Properties --");
-	for (size_t propIndex = 0; propIndex < propCount; propIndex++) {
-		static const char* typeToString[] = {
-			"Empty",
-			"Boolean",
-			"Int64",
-			"Double",
-			"Rect",
-			"Size",
-			"Point",
-			"Rate",
-			"Ratio",
-			"Color",
-			"String",
-			"WString",
-			"Interface"
-		};
-
-		AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(propIndex, (const amf::AMFPropertyInfo**) &pInfo);
-		if (res != AMF_OK)
-			continue;
-		AMF_LOG_INFO(" [%ls] %ls (Type: %s, Index %Iu)",
-			pInfo->name, pInfo->desc, typeToString[pInfo->type], propIndex);
-		AMF_LOG_INFO("  Content Type: %d",
-			pInfo->contentType);
-		AMF_LOG_INFO("  Access: %s%s%s",
-			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_READ) ? "R" : "",
-			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE) ? "W" : "",
-			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE_RUNTIME) ? "X" : "");
-
-		AMF_LOG_INFO("  Values:");
-		amf::AMFVariantStruct curStruct = amf::AMFVariantStruct();
-		m_AMFEncoder->GetProperty(pInfo->name, &curStruct);
-		fastPrintVariant("    Current: ", curStruct);
-		fastPrintVariant("    Default: ", pInfo->defaultValue);
-		fastPrintVariant("    Minimum: ", pInfo->minValue);
-		fastPrintVariant("    Maximum: ", pInfo->maxValue);
-		if (pInfo->pEnumDescription) {
-			AMF_LOG_INFO("  Enumeration: ");
-			const amf::AMFEnumDescriptionEntry* pEnumEntry = pInfo->pEnumDescription;
-			while (pEnumEntry->name != nullptr) {
-				AMF_LOG_INFO("    %ls (%ld)",
-					pEnumEntry->name,
-					pEnumEntry->value);
-				pEnumEntry++;
-			}
-		}
-	}
-}
-#endif
-
-Plugin::AMD::H264Encoder::H264Encoder(
-	H264EncoderType p_Type,
-	std::string p_VideoAPI,
-	uint64_t p_VideoAdapterId,
-	bool p_OpenCL,
-	H264ColorFormat p_SurfaceFormat/* = VCESurfaceFormat_NV12*/
-) {
-	#pragma region Assign Default Values
-	m_EncoderType = p_Type;
-	m_ColorFormat = p_SurfaceFormat;
-	m_OpenCL = p_OpenCL;
-	m_Flag_IsStarted = false;
-	m_Flag_FirstFrameReceived = false;
-	m_Flag_FirstFrameSubmitted = false;
-	m_FrameSize.first = 64;	m_FrameSize.second = 64;
-	m_FrameRate.first = 30; m_FrameRate.second = 1;
-	m_FrameRateDivisor = ((double_t)m_FrameRate.first / (double_t)m_FrameRate.second);
-	m_FrameRateReverseDivisor = ((double_t)m_FrameRate.second / (double_t)m_FrameRate.first);
-	m_InputQueueLimit = (uint32_t)(m_FrameRateDivisor * 3);
-	m_InputQueueLastSize = 0;
-	m_TimerPeriod = 1;
-	m_LastQueueWarnMessageTime = std::chrono::high_resolution_clock::time_point(std::chrono::high_resolution_clock::duration(0));
-	#pragma endregion Assign Default Values
-
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
-
-	AMF_RESULT res = AMF_OK;
-	// AMF
-	m_AMF = AMF::GetInstance();
-	m_AMFFactory = m_AMF->GetFactory();

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/misc-util.cpp Deleted

@@ -1,270 +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
-//////////////////////////////////////////////////////////////////////////
-
-// Plugin
-#include "plugin.h"
-#include "amf.h"
-#include "amf-capabilities.h"
-#include "amf-h264.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-using namespace Plugin::AMD;
-
-namespace Plugin {
-	namespace Utility {
-		H264ProfileLevel inline GetMinimumProfileLevel(std::pair<uint32_t, uint32_t> frameSize, std::pair<uint32_t, uint32_t> frameRate) {
-			typedef std::pair<uint32_t, uint32_t> levelRestriction;
-			typedef std::pair<H264ProfileLevel, levelRestriction> level;
-
-			static const level profileLevelLimit[] = { // [Level, [Samples, Samples_Per_Sec]]
-				level(H264ProfileLevel::L10, levelRestriction(25344, 380160)),
-				level(H264ProfileLevel::L11, levelRestriction(101376, 768000)),
-				level(H264ProfileLevel::L12, levelRestriction(101376, 1536000)),
-				level(H264ProfileLevel::L13, levelRestriction(101376, 3041280)),
-				level(H264ProfileLevel::L20, levelRestriction(101376, 3041280)),
-				level(H264ProfileLevel::L21, levelRestriction(202752, 5068800)),
-				level(H264ProfileLevel::L22, levelRestriction(414720, 5184000)),
-				level(H264ProfileLevel::L30, levelRestriction(414720, 10368000)),
-				level(H264ProfileLevel::L31, levelRestriction(921600, 27648000)),
-				level(H264ProfileLevel::L32, levelRestriction(1310720, 55296000)),
-				//level(H264ProfileLevel::40, levelRestriction(2097152, 62914560)), // Technically identical to 4.1, but backwards compatible.
-				level(H264ProfileLevel::L41, levelRestriction(2097152, 62914560)),
-				level(H264ProfileLevel::L42, levelRestriction(2228224, 133693440)),
-				level(H264ProfileLevel::L50, levelRestriction(5652480, 150994944)),
-				level(H264ProfileLevel::L51, levelRestriction(9437184, 251658240)),
-				level(H264ProfileLevel::L52, levelRestriction(9437184, 530841600)),
-				level((H264ProfileLevel)-1, levelRestriction(0, 0))
-			};
-
-			uint32_t samples = frameSize.first * frameSize.second;
-			uint32_t samples_sec = (uint32_t)ceil((double_t)samples * ((double_t)frameRate.first / (double_t)frameRate.second));
-
-			level curLevel = profileLevelLimit[0];
-			for (uint32_t index = 0; (int32_t)curLevel.first != -1; index++) {
-				curLevel = profileLevelLimit[index];
-
-				if (samples > curLevel.second.first)
-					continue;
-
-				if (samples_sec > curLevel.second.second)
-					continue;
-
-				return curLevel.first;
-			}
-			return H264ProfileLevel::L52;
-		}
-
-		#pragma region VCEEncoderType
-		inline const char* VCEEncoderTypeAsString(H264EncoderType type) {
-			const char* types[] = {
-				"AVC",
-				"SVC",
-				"HEVC"
-			};
-			return types[(uint8_t)type];
-		}
-		inline const wchar_t* VCEEncoderTypeAsAMF(H264EncoderType type) {
-			const wchar_t* types[] = {
-				AMFVideoEncoderVCE_AVC,
-				AMFVideoEncoderVCE_SVC,
-				L"AMFVideoEncoderHW_HEVC"
-			};
-			return types[(uint8_t)type];
-		}
-		#pragma endregion VCEEncoderType
-		#pragma region VCEMemoryType
-		inline const char* MemoryTypeAsString(H264MemoryType memoryType) {
-			static const char* memoryTypeToString[] = {
-				"Host",
-				"DirectX9",
-				"DirectX11",
-				"OpenGL"
-			};
-			return memoryTypeToString[(uint8_t)memoryType];
-		}
-		inline amf::AMF_MEMORY_TYPE MemoryTypeAsAMF(H264MemoryType memoryType) {
-			static amf::AMF_MEMORY_TYPE memoryTypeToAMF[] = {
-				amf::AMF_MEMORY_HOST,
-				amf::AMF_MEMORY_DX9,
-				amf::AMF_MEMORY_DX11,
-				amf::AMF_MEMORY_OPENGL,
-			};
-			return memoryTypeToAMF[(uint8_t)memoryType];
-		}
-		#pragma endregion VCEMemoryType
-		#pragma region VCESurfaceFormat
-		inline const char* SurfaceFormatAsString(H264ColorFormat surfaceFormat) {
-			static const char* surfaceFormatToString[] = {
-				"NV12",
-				"I420",
-				"YUY2",
-				"BGRA",
-				"RGBA",
-				"GRAY",
-			};
-			return surfaceFormatToString[(uint8_t)surfaceFormat];
-		}
-		inline amf::AMF_SURFACE_FORMAT SurfaceFormatAsAMF(H264ColorFormat surfaceFormat) {
-			static amf::AMF_SURFACE_FORMAT surfaceFormatToAMF[] = {
-				// 4:2:0 Formats
-				amf::AMF_SURFACE_NV12,
-				amf::AMF_SURFACE_YUV420P,
-				// 4:2:2 Formats
-				amf::AMF_SURFACE_YUY2,
-				// Uncompressed
-				amf::AMF_SURFACE_BGRA,
-				amf::AMF_SURFACE_RGBA,
-				// Other
-				amf::AMF_SURFACE_GRAY8,
-			};
-			return surfaceFormatToAMF[(uint8_t)surfaceFormat];
-		}
-		#pragma endregion VCESurfaceFormat
-		#pragma region VCEUsage
-		inline const char* UsageAsString(H264Usage usage) {
-			static const char* usageToString[] = {
-				"Transcoding",
-				"Ultra Low Latency",
-				"Low Latency",
-				"Webcam"
-			};
-			return usageToString[(uint8_t)usage];
-		}
-		inline AMF_VIDEO_ENCODER_USAGE_ENUM UsageAsAMF(H264Usage usage) {
-			static AMF_VIDEO_ENCODER_USAGE_ENUM usageToAMF[] = {
-				AMF_VIDEO_ENCODER_USAGE_TRANSCONDING,
-				AMF_VIDEO_ENCODER_USAGE_ULTRA_LOW_LATENCY,
-				AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY,
-				AMF_VIDEO_ENCODER_USAGE_WEBCAM,
-			};
-			return usageToAMF[(uint8_t)usage];
-		}
-		inline H264Usage UsageFromAMF(uint32_t usage) {
-			static H264Usage usageFromAMF[] = {
-				H264Usage::Transcoding,
-				H264Usage::UltraLowLatency,
-				H264Usage::LowLatency,
-				H264Usage::Webcam,
-			};
-			return usageFromAMF[(uint8_t)usage];
-		}
-		#pragma endregion VCEUsage
-		#pragma region VCEQualityPreset
-		inline const char* QualityPresetAsString(H264QualityPreset preset) {
-			static const char* qualityPresetToString[] = {
-				"Speed",
-				"Balanced",
-				"Quality"
-			};
-			return qualityPresetToString[(uint8_t)preset];
-		}
-		#pragma endregion VCEQualityPreset
-		#pragma region VCEProfile
-		inline const char* ProfileAsString(H264Profile profile) {
-			switch (profile) {
-				case H264Profile::Baseline:
-					return "Baseline";
-				case H264Profile::Main:
-					return "Main";
-				case H264Profile::High:
-					return "High";
-				case H264Profile::ConstrainedBaseline:

obs-studio-18.0.2.tar.xz/.gitattributes Added

obs-studio-18.0.2.tar.xz/.gitmodules Added

obs-studio-18.0.1.tar.xz/.travis.yml -> obs-studio-18.0.2.tar.xz/.travis.yml Changed

@@ -1,5 +1,8 @@
 language: cpp
 
+cache:
+  ccache: true
+
 env:
   global:
   # AWS S3 creds
@@ -8,6 +11,12 @@
   # secret
   - secure: "JRQVU2zgC3hY6CEY+Crmh/upp93En0BzKaLcsuBT538johNlK7m5hn3m2UOw63seLvBvVaKKWUDj9N986a3DwcXxWPMyF/9ctXgNWy39WzaVWxrbVR5nQB1fdiRp5YEgkoVN+gEm3OVF7sV5AGzh5/8CvEdRCoTLIGgMGHxW9mc="
 
+  # ccache
+  - USE_CCACHE=1
+  - CCACHE_COMPRESS=1
+  - CCACHE_MAXSIZE=200M
+  - CCACHE_CPP2=1
+
 matrix:
   include:
     - os: osx
@@ -41,12 +50,19 @@
     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:
-  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
+  webhooks:
+    urls:
+      - secure: T5RBY818nO40nr5eC8pdrCfAdQKGkjQdbyYw7mfFrhxWxgt/U5tyKXpX0l9zNGfobS0SnLSqF71OrfW04V97oijXx3q5Y24xV6mSrlLQZOq19+XvGp82LDpkVd4yi2N0kBYpoANB9Pkof4jWT/rKfdQCQttluOLjgr5SM0uWHRg=
     on_success: change
+    on_failure: always
+

obs-studio-18.0.1.tar.xz/CI/before-script-linux.sh -> obs-studio-18.0.2.tar.xz/CI/before-script-linux.sh Changed

obs-studio-18.0.1.tar.xz/CI/before-script-osx.sh -> obs-studio-18.0.2.tar.xz/CI/before-script-osx.sh Changed

obs-studio-18.0.1.tar.xz/CI/install-dependencies-linux.sh -> obs-studio-18.0.2.tar.xz/CI/install-dependencies-linux.sh Changed

@@ -1,19 +1,14 @@
 #!/bin/sh
 set -ex
 
-sudo add-apt-repository ppa:kirillshkrogalev/ffmpeg-next -y
 sudo apt-get -qq update
 sudo apt-get install -y \
         build-essential \
         checkinstall \
         cmake \
         libasound2-dev \
-        libavcodec-ffmpeg-dev \
-        libavdevice-ffmpeg-dev \
-        libavfilter-ffmpeg-dev \
-        libavformat-ffmpeg-dev \
-        libavutil-ffmpeg-dev \
         libcurl4-openssl-dev \
+        libfdk-aac-dev \
         libfontconfig-dev \
         libfreetype6-dev \
         libgl1-mesa-dev \
@@ -22,8 +17,6 @@
         libpulse-dev \
         libqt5x11extras5-dev \
         libspeexdsp-dev \
-        libswresample-ffmpeg-dev \
-        libswscale-ffmpeg-dev \
         libudev-dev \
         libv4l-dev \
         libvlc-dev \
@@ -34,4 +27,14 @@
         libxcomposite-dev \
         libxinerama-dev \
         pkg-config \
-        qtbase5-dev
+        qtbase5-dev \
+        yasm \
+        zlib1g-dev
+
+# FFmpeg
+cd ..
+git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git
+cd ffmpeg
+./configure --enable-shared
+make -j2
+sudo make install

obs-studio-18.0.1.tar.xz/CI/install-dependencies-osx.sh -> obs-studio-18.0.2.tar.xz/CI/install-dependencies-osx.sh Changed

obs-studio-18.0.1.tar.xz/CI/install/osx/obs.png -> obs-studio-18.0.2.tar.xz/CI/install/osx/obs.png Changed

obs-studio-18.0.2.tar.xz/CONTRIBUTING.rst Added

@@ -0,0 +1,90 @@
+Contributing
+============
+
+Quick Links for Contributing
+----------------------------
+
+ - Compiling and building OBS Studio:
+   https://github.com/jp9000/obs-studio/wiki/Install-Instructions
+
+ - Our bug tracker (linked to forum accounts):
+   https://obsproject.com/mantis/
+
+ - Development IRC channel: #obs-dev on QuakeNet
+ 
+ - Development forum:
+   https://obsproject.com/forum/list/general-development.21/
+
+ - To contribute language translations, do not make pull requests.
+   Instead, use crowdin.  Read here for more information:
+   https://obsproject.com/forum/threads/how-to-contribute-translations-for-obs.16327/
+
+Coding Guidelines
+-----------------
+
+ - OBS Studio uses kernel normal form (linux variant), for more
+   information, please read here:
+   https://github.com/torvalds/linux/blob/master/Documentation/process/coding-style.rst
+
+ - Avoid trailing spaces.  To view trailing spaces before making a
+   commit, use "git diff" on your changes.  If colors are enabled for
+   git in the command prompt, it will show you any whitespace issues
+   marked with red.
+
+ - Tabs for indentation, spaces for alignment.  Tabs are treated as 8
+   columns wide.
+
+ - 80 columns max
+
+Commit Guidlines
+----------------
+
+ - OBS Studio uses the 50/72 standard for commits.  50 characters max
+   for the title (excluding module prefix), an empty line, and then a
+   full description of the commit, wrapped to 72 columns max.  See this
+   link for more information: http://chris.beams.io/posts/git-commit/
+
+ - Make sure commit titles are always in present tense, and are not
+   followed by punctuation.
+
+ - Prefix commit titles with the module name, followed by a colon and a
+   space (unless modifying a file in the base directory).  When
+   modifying cmake modules, prefix with "cmake".  So for example, if you
+   are modifying the obs-ffmpeg plugin::
+
+     obs-ffmpeg: Fix bug with audio output
+
+   Or for libobs::
+
+     libobs: Fix source not displaying
+
+ - If you still need examples, please view the commit history.
+
+Headers
+-------
+
+  There's no formal documentation as of yet, so it's recommended to read
+  the headers (which are heavily commented) to learn the API.
+
+  Here are the most important headers to check out::
+
+    libobs/obs.h                Main header
+
+    libobs/obs-module.h         Main header for plugin modules
+
+    libobs/obs-source.h         Creating video/audio sources
+
+    libobs/obs-output.h         Creating outputs
+
+    libobs/obs-encoder.h        Implementing encoders
+
+    libobs/obs-service.h        Implementing custom streaming services
+
+    libobs/graphics/graphics.h  Graphics API
+
+    UI/obs-frontend-api/obs-frontend-api.h
+                                Front-end API
+
+  If you would like to learn from example, examine the default plugins
+  (in the <plugins> subdirectory).  All features of OBS Studio are
+  implemented as plugins.

obs-studio-18.0.2.tar.xz/README.rst Added

@@ -0,0 +1,44 @@
+OBS Studio <https://obsproject.com>
+===================================
+
+What is OBS Studio?
+-------------------
+
+  OBS Studio is software designed for capturing, compositing, encoding,
+  recording, and streaming video content, efficiently.
+
+  It's distributed under the GNU General Public License v2 - see the
+  accompanying COPYING file for more details.
+
+Quick Links
+-----------
+
+ - Website: https://obsproject.com
+
+ - Help/Guides: https://github.com/jp9000/obs-studio/wiki
+
+ - Forums: https://obsproject.com/forum/
+
+ - Build Instructions: https://github.com/jp9000/obs-studio/wiki/Install-Instructions
+
+ - Bug Tracker: https://obsproject.com/mantis/
+
+   (Note: The bug tracker is linked to forum accounts.  To use the bug
+   tracker, log in to a forum account)
+
+Contributing
+------------
+
+ - If you wish to contribute code to the project, please make sure read
+   the coding and commit guidelines:
+   https://github.com/jp9000/obs-studio/blob/master/CONTRIBUTING.rst
+
+ - If you wish to contribute translations, do not submit pull requests.
+   Instead, please use Crowdin.  For more information read this thread:
+   https://obsproject.com/forum/threads/how-to-contribute-translations-for-obs.16327/
+
+ - Other ways to contribute are by helping people out with support on
+   our forums or in our community chat.  Please limit support to topics
+   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.

obs-studio-18.0.1.tar.xz/UI/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/UI/CMakeLists.txt Changed

@@ -36,6 +36,7 @@
 endif()
 
 find_package(Qt5Widgets ${FIND_MODE})
+find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)
 
 if(NOT Qt5Widgets_FOUND)
 	if (ENABLE_UI)
@@ -46,8 +47,11 @@
 	endif()
 endif()
 
+
+include_directories(${FFMPEG_INCLUDE_DIRS})
 include_directories(SYSTEM "obs-frontend-api")
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
+include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/deps/libff")
 
 find_package(Libcurl REQUIRED)
 include_directories(${LIBCURL_INCLUDE_DIRS})
@@ -107,8 +111,23 @@
                 Qt5::X11Extras)
 endif()
 
+set(obs_libffutil_SOURCES
+	../deps/libff/libff/ff-util.c
+	)
+set(obs_libffutil_HEADERS
+	../deps/libff/libff/ff-util.h
+	)
+
+if(MSVC)
+	set_source_files_properties(
+		../deps/libff/libff/ff-util.c
+		PROPERTIES COMPILE_FLAGS -Dinline=__inline
+		)
+endif()
+
 set(obs_SOURCES
 	${obs_PLATFORM_SOURCES}
+	${obs_libffutil_SOURCES}
 	obs-app.cpp
 	api-interface.cpp
 	window-basic-main.cpp
@@ -153,6 +172,7 @@
 
 set(obs_HEADERS
 	${obs_PLATFORM_HEADERS}
+	${obs_libffutil_HEADERS}
 	obs-app.hpp
 	platform.hpp
 	window-main.hpp
@@ -234,9 +254,9 @@
 
 target_link_libraries(obs
 	libobs
-	libff
 	Qt5::Widgets
 	obs-frontend-api
+	${FFMPEG_LIBRARIES}
 	${LIBCURL_LIBRARIES}
 	${obs_PLATFORM_LIBRARIES})

obs-studio-18.0.1.tar.xz/UI/api-interface.cpp -> obs-studio-18.0.2.tar.xz/UI/api-interface.cpp Changed

obs-studio-18.0.1.tar.xz/UI/data/locale/en-US.ini -> obs-studio-18.0.2.tar.xz/UI/data/locale/en-US.ini Changed

obs-studio-18.0.1.tar.xz/UI/forms/OBSBasic.ui -> obs-studio-18.0.2.tar.xz/UI/forms/OBSBasic.ui Changed

@@ -892,6 +892,51 @@
      <addaction name="actionScaleCanvas"/>
      <addaction name="actionScaleOutput"/>
     </widget>
+    <action name="actionCopySource">
+     <property name="text">
+      <string>Copy</string>
+     </property>
+     <property name="shortcut">
+      <string>Ctrl+C</string>
+     </property>
+    </action>
+    <action name="actionPasteRef">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>PasteReference</string>
+     </property>
+     <property name="iconText">
+      <string>PasteReference</string>
+     </property>
+     <property name="toolTip">
+      <string>PasteReference</string>
+     </property>
+     <property name="shortcut">
+      <string>Ctrl+V</string>
+     </property>
+    </action>
+    <action name="actionCopyFilters">
+     <property name="text">
+      <string>Copy.Filters</string>
+     </property>
+    </action>
+    <action name="actionPasteFilters">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Paste.Filters</string>
+     </property>
+    </action>
+    <addaction name="actionCopySource"/>
+    <addaction name="actionPasteRef"/>
+    <addaction name="actionPasteDup"/>
+    <addaction name="separator"/>
+    <addaction name="actionCopyFilters"/>
+    <addaction name="actionPasteFilters"/>
+    <addaction name="separator"/>
     <addaction name="transformMenu"/>
     <addaction name="orderMenu"/>
     <addaction name="scalingMenu"/>
@@ -1143,6 +1188,9 @@
    <property name="text">
     <string>Basic.MainMenu.Edit.Transform.EditTransform</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
   </action>
   <action name="actionCopyTransform">
    <property name="text">
@@ -1409,6 +1457,11 @@
     <string>Basic.MainMenu.Edit.Scale.Output</string>
    </property>
   </action>
+  <action name="actionPasteDup">
+   <property name="text">
+    <string>PasteDuplicate</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

obs-studio-18.0.1.tar.xz/UI/forms/OBSRemux.ui -> obs-studio-18.0.2.tar.xz/UI/forms/OBSRemux.ui Changed

@@ -11,37 +11,9 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>RemuxRecordings</string>
   </property>
-  <widget class="QProgressBar" name="progressBar">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>90</y>
-     <width>351</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="value">
-    <number>24</number>
-   </property>
-  </widget>
-  <widget class="QWidget" name="formLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>471</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <layout class="QFormLayout" name="formLayout">
-    <property name="fieldGrowthPolicy">
-     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-    </property>
-    <property name="verticalSpacing">
-     <number>6</number>
-    </property>
+   <layout class="QGridLayout" name="formLayout">
     <item row="1" column="0">
      <widget class="QLabel" name="label">
       <property name="text">
@@ -60,12 +32,6 @@
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QLineEdit" name="sourceFile">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
        </widget>
       </item>
       <item>
@@ -81,12 +47,6 @@
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
        <widget class="QLineEdit" name="targetFile">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
        </widget>
       </item>
       <item>
@@ -98,21 +58,25 @@
       </item>
      </layout>
     </item>
+    <item row="3" column="0" colspan="2">
+     <widget class="QProgressBar" name="progressBar">
+      <property name="value">
+       <number>24</number>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1">
+     <layout class="QHBoxLayout" name="horizontalLayout_4">
+      <item>
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Ok|QDialogButtonBox::Close</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
    </layout>
-  </widget>
-  <widget class="QPushButton" name="remux">
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>90</y>
-     <width>111</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Remux.Remux</string>
-   </property>
-  </widget>
  </widget>
  <resources/>
  <connections/>

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt Changed

obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions-handler.cpp Added

@@ -0,0 +1,54 @@
+#include "captions-handler.hpp"
+
+captions_handler::captions_handler(
+		captions_cb       callback,
+		enum audio_format format,
+		uint32_t          sample_rate)
+	: cb(callback)
+{
+	if (!reset_resampler(format, sample_rate))
+		throw CAPTIONS_ERROR_GENERIC_FAIL;
+}
+
+bool captions_handler::reset_resampler(
+		enum audio_format format,
+		uint32_t sample_rate)
+try {
+	obs_audio_info ai;
+	if (!obs_get_audio_info(&ai))
+		throw std::string("Failed to get OBS audio info");
+
+	resample_info src = {
+		ai.samples_per_sec,
+		AUDIO_FORMAT_FLOAT_PLANAR,
+		ai.speakers
+	};
+	resample_info dst = {
+		sample_rate,
+		format,
+		SPEAKERS_MONO
+	};
+
+	if (!resampler.reset(dst, src))
+		throw std::string("Failed to create audio resampler");
+
+	return true;
+
+} catch (std::string text) {
+	blog(LOG_WARNING, "%s: %s", __FUNCTION__, text.c_str());
+	return false;
+}
+
+void captions_handler::push_audio(const audio_data *audio)
+{
+	uint8_t *out[MAX_AV_PLANES];
+	uint32_t frames;
+	uint64_t ts_offset;
+	bool success;
+
+	success = audio_resampler_resample(resampler,
+			out, &frames, &ts_offset,
+			(const uint8_t *const *)audio->data, audio->frames);
+	if (success)
+		pcm_data(out[0], frames);
+}

obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions-handler.hpp Added

@@ -0,0 +1,67 @@
+#pragma once
+
+#include <media-io/audio-resampler.h>
+#include <obs-module.h>
+#include <functional>
+#include <string>
+
+class resampler_obj {
+	audio_resampler_t *resampler = nullptr;
+
+public:
+	inline ~resampler_obj()
+	{
+		audio_resampler_destroy(resampler);
+	}
+
+	inline bool reset(const resample_info &dst, const resample_info &src)
+	{
+		audio_resampler_destroy(resampler);
+		resampler = audio_resampler_create(&dst, &src);
+		return !!resampler;
+	}
+
+	inline operator audio_resampler_t*() {return resampler;}
+};
+
+/* ------------------------------------------------------------------------- */
+
+typedef std::function<void (const std::string &)> captions_cb;
+
+#define captions_error(s) std::string(obs_module_text("Captions.Error." ## s))
+#define CAPTIONS_ERROR_GENERIC_FAIL     captions_error("GenericFail")
+
+/* ------------------------------------------------------------------------- */
+
+class captions_handler {
+	captions_cb cb;
+	resampler_obj resampler;
+
+protected:
+	inline void callback(const std::string &text)
+	{
+		cb(text);
+	}
+
+	virtual void pcm_data(const void *data, size_t frames)=0;
+
+	/* always resamples to 1 channel */
+	bool reset_resampler(enum audio_format format, uint32_t sample_rate);
+
+public:
+	/* throw std::string for errors shown to users */
+	captions_handler(
+			captions_cb       callback,
+			enum audio_format format,
+			uint32_t          sample_rate);
+	virtual ~captions_handler() {}
+
+	void push_audio(const audio_data *audio);
+};
+
+/* ------------------------------------------------------------------------- */
+
+struct captions_handler_info {
+	std::string       (*name)(void);
+	captions_handler *(*create)(captions_cb cb, const std::string &lang);
+};

obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions-mssapi-stream.cpp Added

@@ -0,0 +1,408 @@
+#include "captions-mssapi-stream.hpp"
+#include "captions-mssapi.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_, mssapi_captions *handler_) :
+	handler(handler_),
+	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);
+}
+
+void CaptionStream::Stop()
+{
+	{
+		lock_guard<mutex> lock(m);
+		circlebuf_free(buf);
+	}
+
+	cv.notify_one();
+}
+
+void CaptionStream::PushAudio(const void *data, size_t frames)
+{
+	bool ready = false;
+
+	lock_guard<mutex> lock(m);
+	circlebuf_push_back(buf, data, 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;
+}

obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions-mssapi-stream.hpp Added

@@ -0,0 +1,94 @@
+#pragma once
+
+#include <windows.h>
+#include <sapi.h>
+#include <condition_variable>
+#include <mutex>
+#include <vector>
+#include <obs.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 mssapi_captions;
+
+class CaptionStream : public ISpAudio {
+	volatile long refs = 1;
+	SPAUDIOBUFFERINFO buf_info = {};
+	mssapi_captions *handler;
+	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 = {};
+
+	CircleBuf buf;
+	ULONG wait_size = 0;
+	DWORD samplerate = 0;
+	ULARGE_INTEGER pos = {};
+	ULONGLONG write_pos = 0;
+
+public:
+	CaptionStream(DWORD samplerate, mssapi_captions *handler_);
+
+	void Stop();
+	void PushAudio(const void *data, size_t frames);
+
+	// 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;
+};

obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions-mssapi.cpp Added

@@ -0,0 +1,179 @@
+#include "captions-mssapi.hpp"
+
+#define do_log(type, format, ...) blog(type, "[Captions] " format, \
+		##__VA_ARGS__)
+
+#define error(format, ...) do_log(LOG_ERROR, format, ##__VA_ARGS__)
+#define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
+
+mssapi_captions::mssapi_captions(
+		captions_cb callback,
+		const std::string &lang) try
+	: captions_handler(callback, AUDIO_FORMAT_16BIT, 16000)
+{
+	HRESULT hr;
+
+	std::wstring wlang;
+	wlang.resize(lang.size());
+
+	for (size_t i = 0; i < lang.size(); i++)
+		wlang[i] = (wchar_t)lang[i];
+
+	LCID lang_id = LocaleNameToLCID(wlang.c_str(), 0);
+
+	wchar_t lang_str[32];
+	_snwprintf(lang_str, 31, L"language=%x", (int)lang_id);
+
+	stop = CreateEvent(nullptr, false, false, nullptr);
+	if (!stop.Valid())
+		throw "Failed to create event";
+
+	hr = SpFindBestToken(SPCAT_RECOGNIZERS, lang_str, nullptr, &token);
+	if (FAILED(hr))
+		throw HRError("SpFindBestToken failed", hr);
+
+	hr = CoCreateInstance(CLSID_SpInprocRecognizer, nullptr, CLSCTX_ALL,
+			__uuidof(ISpRecognizer), (void**)&recognizer);
+	if (FAILED(hr))
+		throw HRError("CoCreateInstance for recognizer failed", hr);
+
+	hr = recognizer->SetRecognizer(token);
+	if (FAILED(hr))
+		throw HRError("SetRecognizer failed", hr);
+
+	hr = recognizer->SetRecoState(SPRST_INACTIVE);
+	if (FAILED(hr))
+		throw HRError("SetRecoState(SPRST_INACTIVE) failed", hr);
+
+	hr = recognizer->CreateRecoContext(&context);
+	if (FAILED(hr))
+		throw HRError("CreateRecoContext failed", hr);
+
+	ULONGLONG interest = SPFEI(SPEI_RECOGNITION) |
+	                     SPFEI(SPEI_END_SR_STREAM);
+	hr = context->SetInterest(interest, interest);
+	if (FAILED(hr))
+		throw HRError("SetInterest failed", hr);
+
+	hr = context->SetNotifyWin32Event();
+	if (FAILED(hr))
+		throw HRError("SetNotifyWin32Event", hr);
+
+	notify = context->GetNotifyEventHandle();
+	if (notify == INVALID_HANDLE_VALUE)
+		throw HRError("GetNotifyEventHandle failed", E_NOINTERFACE);
+
+	size_t sample_rate = audio_output_get_sample_rate(obs_get_audio());
+	audio = new CaptionStream((DWORD)sample_rate, this);
+	audio->Release();
+
+	hr = recognizer->SetInput(audio, false);
+	if (FAILED(hr))
+		throw HRError("SetInput failed", hr);
+
+	hr = context->CreateGrammar(1, &grammar);
+	if (FAILED(hr))
+		throw HRError("CreateGrammar failed", hr);
+
+	hr = grammar->LoadDictation(nullptr, SPLO_STATIC);
+	if (FAILED(hr))
+		throw HRError("LoadDictation failed", hr);
+
+	try {
+		t = std::thread([this] () {main_thread();});
+	} catch (...) {
+		throw "Failed to create thread";
+	}
+
+} catch (const char *err) {
+	blog(LOG_WARNING, "%s: %s", __FUNCTION__, err);
+	throw CAPTIONS_ERROR_GENERIC_FAIL;
+
+} catch (HRError err) {
+	blog(LOG_WARNING, "%s: %s (%lX)", __FUNCTION__, err.str, err.hr);
+	throw CAPTIONS_ERROR_GENERIC_FAIL;
+}
+
+mssapi_captions::~mssapi_captions()
+{
+	if (t.joinable()) {
+		SetEvent(stop);
+		t.join();
+	}
+}
+
+void mssapi_captions::main_thread()
+try {
+	HRESULT hr;
+
+	os_set_thread_name(__FUNCTION__);
+
+	hr = grammar->SetDictationState(SPRS_ACTIVE);
+	if (FAILED(hr))
+		throw HRError("SetDictationState failed", hr);
+
+	hr = recognizer->SetRecoState(SPRST_ACTIVE);
+	if (FAILED(hr))
+		throw HRError("SetRecoState(SPRST_ACTIVE) failed", hr);
+
+	HANDLE events[] = {notify, stop};
+
+	started = true;
+
+	for (;;) {
+		DWORD ret = WaitForMultipleObjects(2, events, false, INFINITE);
+		if (ret != WAIT_OBJECT_0)
+			break;
+
+		CSpEvent event;
+		bool exit = false;
+
+		while (event.GetFrom(context) == S_OK) {
+			if (event.eEventId == SPEI_RECOGNITION) {
+				ISpRecoResult *result = event.RecoResult();
+
+				CoTaskMemPtr<wchar_t> text;
+				hr = result->GetText((ULONG)-1, (ULONG)-1,
+						true, &text, nullptr);
+				if (FAILED(hr))
+					continue;
+
+				char text_utf8[512];
+				os_wcs_to_utf8(text, 0, text_utf8, 512);
+
+				callback(text_utf8);
+
+				blog(LOG_DEBUG, "\"%s\"", text_utf8);
+
+			} else if (event.eEventId == SPEI_END_SR_STREAM) {
+				exit = true;
+				break;
+			}
+		}
+
+		if (exit)
+			break;
+	}
+
+	audio->Stop();
+
+} catch (HRError err) {
+	blog(LOG_WARNING, "%s failed: %s (%lX)", __FUNCTION__, err.str, err.hr);
+}
+
+void mssapi_captions::pcm_data(const void *data, size_t frames)
+{
+	if (started)
+		audio->PushAudio(data, frames);
+}
+
+captions_handler_info mssapi_info = {
+	[] () -> std::string
+	{
+		return "Microsoft Speech-to-Text";
+	},
+	[] (captions_cb cb, const std::string &lang) -> captions_handler *
+	{
+		return new mssapi_captions(cb, lang);
+	}
+};

obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions-mssapi.hpp Added

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/captions.cpp -> obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions.cpp Changed

@@ -1,47 +1,54 @@
+#include <QMessageBox>
+
+#include <windows.h>
 #include <obs-frontend-api.h>
-#include "captions-stream.hpp"
 #include "captions.hpp"
+#include "captions-handler.hpp"
 #include "tool-helpers.hpp"
-#include <sphelper.h>
 #include <util/dstr.hpp>
 #include <util/platform.h>
-#include <util/windows/HRError.hpp>
+#include <util/windows/WinHandle.hpp>
 #include <util/windows/ComPtr.hpp>
-#include <util/windows/CoTaskMemPtr.hpp>
-#include <util/threading.h>
 #include <obs-module.h>
+#include <sphelper.h>
 
+#include <unordered_map>
+#include <vector>
 #include <string>
 #include <thread>
 #include <mutex>
 
+#include "captions-mssapi.hpp"
+
 #define do_log(type, format, ...) blog(type, "[Captions] " format, \
 		##__VA_ARGS__)
 
-#define error(format, ...) do_log(LOG_ERROR, format, ##__VA_ARGS__)
+#define warn(format, ...) do_log(LOG_WARNING, format, ##__VA_ARGS__)
 #define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
 
 using namespace std;
 
-struct obs_captions {
-	thread th;
-	recursive_mutex m;
-	WinHandle stop_event;
+#define DEFAULT_HANDLER "mssapi"
 
+struct obs_captions {
+	string handler_id = DEFAULT_HANDLER;
 	string source_name;
 	OBSWeakSource source;
-	LANGID lang_id;
+	unique_ptr<captions_handler> handler;
+	LANGID lang_id = GetUserDefaultUILanguage();
 
-	void main_thread();
-	void start();
-	void stop();
+	std::unordered_map<std::string, captions_handler_info&> handler_types;
 
-	inline obs_captions() :
-		stop_event(CreateEvent(nullptr, false, false, nullptr)),
-		lang_id(GetUserDefaultUILanguage())
+	inline void register_handler(const char *id,
+			captions_handler_info &info)
 	{
+		handler_types.emplace(id, info);
 	}
 
+	void start();
+	void stop();
+
+	obs_captions();
 	inline ~obs_captions() {stop();}
 };
 
@@ -72,8 +79,6 @@
 {
 	ui->setupUi(this);
 
-	lock_guard<recursive_mutex> lock(captions->m);
-
 	auto cb = [this] (obs_source_t *source)
 	{
 		uint32_t caps = obs_source_get_output_flags(source);
@@ -97,8 +102,19 @@
 			return (*static_cast<cb_t*>(data))(source);}, &cb);
 	ui->source->blockSignals(false);
 
+	for (auto &ht : captions->handler_types) {
+		QString name = ht.second.name().c_str();
+		QString id = ht.first.c_str();
+		ui->provider->addItem(name, id);
+	}
+
+	QString qhandler_id = captions->handler_id.c_str();
+	int idx = ui->provider->findData(qhandler_id);
+	if (idx != -1)
+		ui->provider->setCurrentIndex(idx);
+
 	ui->enable->blockSignals(true);
-	ui->enable->setChecked(captions->th.joinable());
+	ui->enable->setChecked(!!captions->handler);
 	ui->enable->blockSignals(false);
 
 	vector<locale_info> locales;
@@ -129,13 +145,11 @@
 		ui->language->setEnabled(false);
 
 	} else if (!set_language) {
-		bool started = captions->th.joinable();
+		bool started = !!captions->handler;
 		if (started)
 			captions->stop();
 
-		captions->m.lock();
 		captions->lang_id = locales[0].id;
-		captions->m.unlock();
 
 		if (started)
 			captions->start();
@@ -144,14 +158,12 @@
 
 void CaptionsDialog::on_source_currentIndexChanged(int)
 {
-	bool started = captions->th.joinable();
+	bool started = !!captions->handler;
 	if (started)
 		captions->stop();
 
-	captions->m.lock();
 	captions->source_name = ui->source->currentText().toUtf8().constData();
 	captions->source = GetWeakSourceByName(captions->source_name.c_str());
-	captions->m.unlock();
 
 	if (started)
 		captions->start();
@@ -159,205 +171,122 @@
 
 void CaptionsDialog::on_enable_clicked(bool checked)
 {
-	if (checked)
+	if (checked) {
 		captions->start();
-	else
+		if (!captions->handler) {
+			ui->enable->blockSignals(true);
+			ui->enable->setChecked(false);
+			ui->enable->blockSignals(false);
+		}
+	} else {
 		captions->stop();
+	}
 }
 
 void CaptionsDialog::on_language_currentIndexChanged(int)
 {
-	bool started = captions->th.joinable();
+	bool started = !!captions->handler;
 	if (started)
 		captions->stop();
 
-	captions->m.lock();
 	captions->lang_id = (LANGID)ui->language->currentData().toInt();
-	captions->m.unlock();
 
 	if (started)
 		captions->start();
 }
 
-/* ------------------------------------------------------------------------- */
-
-void obs_captions::main_thread()
-try {
-	ComPtr<CaptionStream>  audio;
-	ComPtr<ISpObjectToken> token;
-	ComPtr<ISpRecoGrammar> grammar;
-	ComPtr<ISpRecognizer>  recognizer;
-	ComPtr<ISpRecoContext> context;
-	HRESULT hr;
-
-	auto cb = [&] (const struct audio_data *audio_data,
-			bool muted)
-	{
-		audio->PushAudio(audio_data, muted);
-	};
-
-	using cb_t = decltype(cb);
-
-	auto pre_cb = [] (void *param, obs_source_t*,
-		const struct audio_data *audio_data, bool muted)
-	{
-		return (*static_cast<cb_t*>(param))(audio_data, muted);
-	};
-
-	os_set_thread_name(__FUNCTION__);
-
-	CoInitialize(nullptr);
-
-	wchar_t lang_str[32];
-	_snwprintf(lang_str, 31, L"language=%x", (int)captions->lang_id);
-
-	hr = SpFindBestToken(SPCAT_RECOGNIZERS, lang_str, nullptr, &token);
-	if (FAILED(hr))

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/captions.hpp -> obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions.hpp Changed

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-US.ini -> obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-US.ini Changed

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/forms/captions.ui -> obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/forms/captions.ui Changed

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/forms/output-timer.ui -> obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/forms/output-timer.ui Changed

obs-studio-18.0.1.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.cpp -> obs-studio-18.0.2.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.cpp Changed

obs-studio-18.0.1.tar.xz/UI/obs-app.cpp -> obs-studio-18.0.2.tar.xz/UI/obs-app.cpp Changed

@@ -69,6 +69,8 @@
 bool opt_studio_mode = false;
 bool opt_start_replaybuffer = false;
 bool opt_minimize_tray = false;
+bool opt_allow_opengl = false;
+bool opt_always_on_top = false;
 string opt_starting_collection;
 string opt_starting_profile;
 string opt_starting_scene;
@@ -1302,7 +1304,7 @@
 	return ret;
 }
 
-#define MAX_CRASH_REPORT_SIZE (50 * 1024)
+#define MAX_CRASH_REPORT_SIZE (150 * 1024)
 
 #ifdef _WIN32
 
@@ -1756,6 +1758,9 @@
 		} else if (arg_is(argv[i], "--verbose", nullptr)) {
 			log_verbose = true;
 
+		} else if (arg_is(argv[i], "--always-on-top", nullptr)) {
+			opt_always_on_top = true;
+
 		} else if (arg_is(argv[i], "--unfiltered_log", nullptr)) {
 			unfiltered_log = true;
 
@@ -1783,6 +1788,9 @@
 		} else if (arg_is(argv[i], "--studio-mode", nullptr)) {
 			opt_studio_mode = true;
 
+		} else if (arg_is(argv[i], "--allow-opengl", nullptr)) {
+			opt_allow_opengl = true;
+
 		} else if (arg_is(argv[i], "--help", "-h")) {
 			std::cout <<
 			"--help, -h: Get list of available commands.\n\n" << 
@@ -1797,7 +1805,9 @@
 			"--minimize-to-tray: Minimize to system tray.\n" <<
 			"--portable, -p: Use portable mode.\n\n" <<
 			"--verbose: Make log more verbose.\n" <<
+			"--always-on-top: Start in 'always on top' mode.\n\n" <<
 			"--unfiltered_log: Make log unfiltered.\n\n" <<
+			"--allow-opengl: Allow OpenGL on Windows.\n\n" <<
 			"--version, -V: Get current version.\n";
 
 			exit(0);

obs-studio-18.0.1.tar.xz/UI/obs-app.hpp -> obs-studio-18.0.2.tar.xz/UI/obs-app.hpp Changed

obs-studio-18.0.1.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp -> obs-studio-18.0.2.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp Changed

obs-studio-18.0.1.tar.xz/UI/obs-frontend-api/obs-frontend-api.h -> obs-studio-18.0.2.tar.xz/UI/obs-frontend-api/obs-frontend-api.h Changed

obs-studio-18.0.1.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp -> obs-studio-18.0.2.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp Changed

obs-studio-18.0.1.tar.xz/UI/properties-view.cpp -> obs-studio-18.0.2.tar.xz/UI/properties-view.cpp Changed

@@ -291,6 +291,11 @@
 	QLineEdit   *edit      = new QLineEdit();
 	QPushButton *button    = new QPushButton(QTStr("Browse"));
 
+	if (!obs_property_enabled(prop)) {
+		edit->setEnabled(false);
+		button->setEnabled(false);
+	}
+
 	edit->setText(QT_UTF8(val));
 	edit->setReadOnly(true);
 	edit->setToolTip(QT_UTF8(obs_property_long_description(prop)));
@@ -316,6 +321,9 @@
 	int        val   = (int)obs_data_get_int(settings, name);
 	QSpinBox   *spin = new QSpinBox();
 
+	if (!obs_property_enabled(prop))
+		spin->setEnabled(false);
+
 	int minVal = obs_property_int_min(prop);
 	int maxVal = obs_property_int_max(prop);
 	int stepVal = obs_property_int_step(prop);
@@ -362,6 +370,9 @@
 	double         val   = obs_data_get_double(settings, name);
 	QDoubleSpinBox *spin = new QDoubleSpinBox();
 
+	if (!obs_property_enabled(prop))
+		spin->setEnabled(false);
+
 	double minVal = obs_property_float_min(prop);
 	double maxVal = obs_property_float_max(prop);
 	double stepVal = obs_property_float_step(prop);
@@ -554,6 +565,9 @@
 	QListWidget      *list  = new QListWidget();
 	size_t           count  = obs_data_array_count(array);
 
+	if (!obs_property_enabled(prop))
+		list->setEnabled(false);
+
 	list->setSortingEnabled(false);
 	list->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	list->setToolTip(QT_UTF8(obs_property_long_description(prop)));
@@ -609,6 +623,11 @@
 	long long   val         = obs_data_get_int(settings, name);
 	QColor      color       = color_from_int(val);
 
+	if (!obs_property_enabled(prop)) {
+		button->setEnabled(false);
+		colorLabel->setEnabled(false);
+	}
+
 	button->setText(QTStr("Basic.PropertiesWindow.SelectColor"));
 	button->setToolTip(QT_UTF8(obs_property_long_description(prop)));
 
@@ -671,6 +690,11 @@
 	QLabel      *fontLabel = new QLabel;
 	QFont       font;
 
+	if (!obs_property_enabled(prop)) {
+		button->setEnabled(false);
+		fontLabel->setEnabled(false);
+	}
+
 	font = fontLabel->font();
 	MakeQFont(font_obj, font, true);
 
@@ -1356,6 +1380,9 @@
 		label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 	}
 
+	if (label && !obs_property_enabled(property))
+		label->setEnabled(false);
+
 	if (!widget)
 		return;

obs-studio-18.0.1.tar.xz/UI/win-update/updater/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/UI/win-update/updater/CMakeLists.txt Changed

obs-studio-18.0.1.tar.xz/UI/win-update/updater/http.cpp -> obs-studio-18.0.2.tar.xz/UI/win-update/updater/http.cpp Changed

obs-studio-18.0.1.tar.xz/UI/win-update/updater/updater.cpp -> obs-studio-18.0.2.tar.xz/UI/win-update/updater/updater.cpp Changed

@@ -580,6 +580,27 @@
 	return false;
 }
 
+static inline bool is_64bit_windows(void)
+{
+#ifdef _WIN64
+	return true;
+#else
+	BOOL x86 = false;
+	bool success = !!IsWow64Process(GetCurrentProcess(), &x86);
+	return success && !!x86;
+#endif
+}
+
+static inline bool is_64bit_file(const char *file)
+{
+	if (!file)
+		return false;
+
+	return strstr(file, "64bit") != nullptr ||
+	       strstr(file, "64.dll") != nullptr ||
+	       strstr(file, "64.exe") != nullptr;
+}
+
 #define UTF8ToWideBuf(wide, utf8) UTF8ToWide(wide, _countof(wide), utf8)
 #define WideToUTF8Buf(utf8, wide) WideToUTF8(utf8, _countof(utf8), wide)
 
@@ -592,6 +613,8 @@
 	json_t *name    = json_object_get(package, "name");
 	json_t *files   = json_object_get(package, "files");
 
+	bool isWin64 = is_64bit_windows();
+
 	if (!json_is_array(files))
 		return true;
 	if (!json_is_string(name))
@@ -628,6 +651,9 @@
 		if (strlen(hashUTF8) != BLAKE2_HASH_LENGTH * 2)
 			continue;
 
+		if (!isWin64 && is_64bit_file(fileUTF8))
+			continue;
+
 		/* convert strings to wide */
 
 		wchar_t sourceURL[1024];
@@ -987,18 +1013,18 @@
 
 	StringCbPrintf(manifestPath, sizeof(manifestPath),
 			L"%s\\updates\\manifest.json", lpAppDataPath);
-	if (!GetTempPathW(_countof(tempPath), tempPath)) {
+	if (!GetTempPathW(_countof(tempDirName), tempDirName)) {
 		Status(L"Update failed: Failed to get temp path: %ld",
 				GetLastError());
 		return false;
 	}
-	if (!GetTempFileNameW(tempDirName, L"obs-studio", 0, tempDirName)) {
+	if (!GetTempFileNameW(tempDirName, L"obs-studio", 0, tempPath)) {
 		Status(L"Update failed: Failed to create temp dir name: %ld",
 				GetLastError());
 		return false;
 	}
 
-	StringCbCat(tempPath, sizeof(tempPath), tempDirName);
+	DeleteFile(tempPath);
 	CreateDirectory(tempPath, nullptr);
 
 	/* ------------------------------------- *
@@ -1086,7 +1112,8 @@
 	 * Send file hashes                      */
 
 	string newManifest;
-	{
+
+	if (json_array_size(files) > 0) {
 		char *post_body = json_dumps(files, JSON_COMPACT);
 
 		int    responseCode;
@@ -1117,6 +1144,8 @@
 					responseCode);
 			return false;
 		}
+	} else {
+		newManifest = "[]";
 	}
 
 	/* ------------------------------------- *

obs-studio-18.0.1.tar.xz/UI/window-basic-adv-audio.cpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-adv-audio.cpp Changed

obs-studio-18.0.1.tar.xz/UI/window-basic-main-dropfiles.cpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-main-dropfiles.cpp Changed

@@ -62,6 +62,7 @@
 	obs_data_t *settings = obs_data_create();
 	obs_source_t *source = nullptr;
 	const char *type = nullptr;
+	QString name;
 
 	switch (image) {
 	case DropType_RawText:
@@ -71,20 +72,25 @@
 	case DropType_Text:
 		obs_data_set_bool(settings, "read_from_file", true);
 		obs_data_set_string(settings, "file", data);
+		name = QUrl::fromLocalFile(QString(data)).fileName();
 		type = "text_gdiplus";
 		break;
 	case DropType_Image:
 		obs_data_set_string(settings, "file", data);
+		name = QUrl::fromLocalFile(QString(data)).fileName();
 		type = "image_source";
 		break;
 	case DropType_Media:
 		obs_data_set_string(settings, "local_file", data);
+		name = QUrl::fromLocalFile(QString(data)).fileName();
 		type = "ffmpeg_source";
 		break;
 	}
 
-	const char *name = obs_source_get_display_name(type);
-	source = obs_source_create(type, GenerateSourceName(name).c_str(),
+	if (name.isEmpty())
+		name = obs_source_get_display_name(type);
+	source = obs_source_create(type,
+			GenerateSourceName(QT_TO_UTF8(name)).c_str(),
 			settings, nullptr);
 	if (source) {
 		OBSScene scene = main->GetCurrentScene();

obs-studio-18.0.1.tar.xz/UI/window-basic-main-scene-collections.cpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-main-scene-collections.cpp Changed

obs-studio-18.0.1.tar.xz/UI/window-basic-main.cpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-main.cpp Changed

@@ -1371,7 +1371,7 @@
 
 	bool alwaysOnTop = config_get_bool(App()->GlobalConfig(), "BasicWindow",
 			"AlwaysOnTop");
-	if (alwaysOnTop) {
+	if (alwaysOnTop || opt_always_on_top) {
 		SetAlwaysOnTop(this, true);
 		ui->actionAlwaysOnTop->setChecked(true);
 	}
@@ -1928,6 +1928,7 @@
 
 	QListWidgetItem *sel = nullptr;
 	int count = ui->scenes->count();
+
 	for (int i = 0; i < count; i++) {
 		auto item = ui->scenes->item(i);
 		auto cur_scene = GetOBSRef<OBSScene>(item);
@@ -2139,6 +2140,17 @@
 
 bool OBSBasic::QueryRemoveSource(obs_source_t *source)
 {
+	if (obs_source_get_type(source) == OBS_SOURCE_TYPE_SCENE) {
+		int count = ui->scenes->count();
+
+		if (count == 1) {
+			QMessageBox::information(this,
+						QTStr("FinalScene.Title"),
+						QTStr("FinalScene.Text"));
+			return false;
+		}
+	}
+
 	const char *name  = obs_source_get_name(source);
 
 	QString text = QTStr("ConfirmRemove.Text");
@@ -2207,14 +2219,6 @@
 #endif
 }
 
-#ifdef __APPLE__
-#define VERSION_ENTRY "mac"
-#elif _WIN32
-#define VERSION_ENTRY "windows"
-#else
-#define VERSION_ENTRY "other"
-#endif
-
 void OBSBasic::updateCheckFinished()
 {
 	ui->actionCheckForUpdates->setEnabled(true);
@@ -2918,6 +2922,7 @@
 {
 	if (event->type() == QEvent::WindowStateChange &&
 	    isMinimized() &&
+	    trayIcon &&
 	    trayIcon->isVisible() &&
 	    sysTrayMinimizeToTray()) {
 
@@ -3337,6 +3342,19 @@
 	if (addSourceMenu)
 		popup.addMenu(addSourceMenu);
 
+	ui->actionCopyFilters->setEnabled(false);
+
+	popup.addSeparator();
+	popup.addAction(ui->actionCopySource);
+	popup.addAction(ui->actionPasteRef);
+	popup.addAction(ui->actionPasteDup);
+	popup.addSeparator();
+
+	popup.addSeparator();
+	popup.addAction(ui->actionCopyFilters);
+	popup.addAction(ui->actionPasteFilters);
+	popup.addSeparator();
+
 	if (item) {
 		if (addSourceMenu)
 			popup.addSeparator();
@@ -3383,6 +3401,8 @@
 				SLOT(OpenFilters()));
 		popup.addAction(QTStr("Properties"), this,
 				SLOT(on_actionSourceProperties_triggered()));
+
+		ui->actionCopyFilters->setEnabled(true);
 	}
 
 	popup.exec(QCursor::pos());
@@ -5260,3 +5280,60 @@
 	return config_get_bool(GetGlobalConfig(),
 			"BasicWindow", "SysTrayMinimizeToTray");
 }
+
+void OBSBasic::on_actionCopySource_triggered()
+{
+	on_actionCopyTransform_triggered();
+
+	OBSSceneItem item = GetCurrentSceneItem();
+
+	if (!item)
+		return;
+
+	OBSSource source = obs_sceneitem_get_source(item);
+
+	copyString = obs_source_get_name(source);
+	copyVisible = obs_sceneitem_visible(item);
+
+	ui->actionPasteRef->setEnabled(true);
+	ui->actionPasteDup->setEnabled(true);
+}
+
+void OBSBasic::on_actionPasteRef_triggered()
+{
+	OBSBasicSourceSelect::SourcePaste(copyString, copyVisible, false);
+	on_actionPasteTransform_triggered();
+}
+
+void OBSBasic::on_actionPasteDup_triggered()
+{
+	OBSBasicSourceSelect::SourcePaste(copyString, copyVisible, true);
+	on_actionPasteTransform_triggered();
+}
+
+void OBSBasic::on_actionCopyFilters_triggered()
+{
+	OBSSceneItem item = GetCurrentSceneItem();
+
+	if (!item)
+		return;
+
+	OBSSource source = obs_sceneitem_get_source(item);
+
+	copyFiltersString = obs_source_get_name(source);
+
+	ui->actionPasteFilters->setEnabled(true);
+}
+
+void OBSBasic::on_actionPasteFilters_triggered()
+{
+	OBSSource source = obs_get_source_by_name(copyFiltersString);
+	OBSSceneItem sceneItem = GetCurrentSceneItem();
+
+	OBSSource dstSource = obs_sceneitem_get_source(sceneItem);
+
+	if (source == dstSource)
+		return;
+
+	obs_source_copy_filters(dstSource, source);
+}

obs-studio-18.0.1.tar.xz/UI/window-basic-main.hpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-main.hpp Changed

obs-studio-18.0.1.tar.xz/UI/window-basic-preview.hpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-preview.hpp Changed

obs-studio-18.0.1.tar.xz/UI/window-basic-settings.cpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-settings.cpp Changed

obs-studio-18.0.1.tar.xz/UI/window-basic-source-select.cpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-source-select.cpp Changed

@@ -93,7 +93,28 @@
 	obs_sceneitem_set_visible(sceneitem, data->visible);
 }
 
-static void AddExisting(const char *name, const bool visible)
+static char *get_new_source_name(const char *name)
+{
+	struct dstr new_name = {0};
+	int inc = 0;
+
+	dstr_copy(&new_name, name);
+
+	for (;;) {
+		obs_source_t *existing_source = obs_get_source_by_name(
+				new_name.array);
+		if (!existing_source)
+			break;
+
+		obs_source_release(existing_source);
+
+		dstr_printf(&new_name, "%s %d", name, ++inc + 1);
+	}
+
+	return new_name.array;
+}
+
+static void AddExisting(const char *name, bool visible, bool duplicate)
 {
 	OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
 	OBSScene scene = main->GetCurrentScene();
@@ -102,6 +123,17 @@
 
 	obs_source_t *source = obs_get_source_by_name(name);
 	if (source) {
+		if (duplicate) {
+			obs_source_t *from = source;
+			char *new_name = get_new_source_name(name);
+			source = obs_source_duplicate(from, new_name, false);
+			bfree(new_name);
+			obs_source_release(from);
+
+			if (!source)
+				return;
+		}
+
 		AddSourceData data;
 		data.source = source;
 		data.visible = visible;
@@ -155,7 +187,7 @@
 		if (!item)
 			return;
 
-		AddExisting(QT_TO_UTF8(item->text()), visible);
+		AddExisting(QT_TO_UTF8(item->text()), visible, false);
 	} else {
 		if (ui->sourceName->text().isEmpty()) {
 			QMessageBox::information(this,
@@ -243,3 +275,8 @@
 		obs_enum_sources(EnumSources, this);
 	}
 }
+
+void OBSBasicSourceSelect::SourcePaste(const char *name, bool visible, bool dup)
+{
+	AddExisting(name, visible, dup);
+}

obs-studio-18.0.1.tar.xz/UI/window-basic-source-select.hpp -> obs-studio-18.0.2.tar.xz/UI/window-basic-source-select.hpp Changed

obs-studio-18.0.1.tar.xz/UI/window-remux.cpp -> obs-studio-18.0.2.tar.xz/UI/window-remux.cpp Changed

@@ -40,7 +40,8 @@
 	ui->setupUi(this);
 
 	ui->progressBar->setVisible(false);
-	ui->remux->setEnabled(false);
+	ui->buttonBox->button(QDialogButtonBox::Ok)->
+			setEnabled(false);
 	ui->targetFile->setEnabled(false);
 	ui->browseTarget->setEnabled(false);
 
@@ -54,11 +55,19 @@
 			[&]() { BrowseInput(); });
 	connect(ui->browseTarget, &QPushButton::clicked,
 			[&]() { BrowseOutput(); });
-	connect(ui->remux, &QPushButton::clicked, [&]() { Remux(); });
 
 	connect(ui->sourceFile, &QLineEdit::textChanged,
 			this, &OBSRemux::inputChanged);
 
+	ui->buttonBox->button(QDialogButtonBox::Ok)->
+			setText(QTStr("Remux.Remux"));
+
+	connect(ui->buttonBox->button(QDialogButtonBox::Ok),
+		SIGNAL(clicked()), this, SLOT(Remux()));
+
+	connect(ui->buttonBox->button(QDialogButtonBox::Close),
+		SIGNAL(clicked()), this, SLOT(close()));
+
 	worker->moveToThread(&remuxer);
 	remuxer.start();
 
@@ -116,12 +125,14 @@
 void OBSRemux::inputChanged(const QString &path)
 {
 	if (!QFileInfo::exists(path)) {
-		ui->remux->setEnabled(false);
+		ui->buttonBox->button(QDialogButtonBox::Ok)->
+			setEnabled(false);
 		return;
 	}
 
 	ui->sourceFile->setText(path);
-	ui->remux->setEnabled(true);
+	ui->buttonBox->button(QDialogButtonBox::Ok)->
+			setEnabled(true);
 
 	QFileInfo fi(path);
 	QString mp4 = fi.path() + "/" + fi.baseName() + ".mp4";
@@ -161,7 +172,8 @@
 	worker->lastProgress = 0.f;
 
 	ui->progressBar->setVisible(true);
-	ui->remux->setEnabled(false);
+	ui->buttonBox->button(QDialogButtonBox::Ok)->
+			setEnabled(false);
 
 	emit remux();
 }
@@ -195,7 +207,8 @@
 
 	worker->job.reset();
 	ui->progressBar->setVisible(false);
-	ui->remux->setEnabled(true);
+	ui->buttonBox->button(QDialogButtonBox::Ok)->
+			setEnabled(true);
 }
 
 RemuxWorker::RemuxWorker()

obs-studio-18.0.1.tar.xz/UI/window-remux.hpp -> obs-studio-18.0.2.tar.xz/UI/window-remux.hpp Changed

obs-studio-18.0.1.tar.xz/deps/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/deps/CMakeLists.txt Changed

obs-studio-18.0.2.tar.xz/deps/jansson/test/suites/.gitattributes Added

obs-studio-18.0.1.tar.xz/deps/libff/libff/ff-util.c -> obs-studio-18.0.2.tar.xz/deps/libff/libff/ff-util.c Changed

obs-studio-18.0.2.tar.xz/deps/media-playback Added

obs-studio-18.0.2.tar.xz/deps/media-playback/CMakeLists.txt Added

obs-studio-18.0.2.tar.xz/deps/media-playback/media-playback Added

obs-studio-18.0.2.tar.xz/deps/media-playback/media-playback/closest-format.h Added

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017 Hugh Bailey <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+static enum AVPixelFormat closest_format(enum AVPixelFormat fmt)
+{
+	switch (fmt) {
+	case AV_PIX_FMT_YUYV422:
+		return AV_PIX_FMT_YUYV422;
+
+	case AV_PIX_FMT_YUV422P:
+	case AV_PIX_FMT_YUVJ422P:
+	case AV_PIX_FMT_UYVY422:
+	case AV_PIX_FMT_YUV422P16LE:
+	case AV_PIX_FMT_YUV422P16BE:
+	case AV_PIX_FMT_YUV422P10BE:
+	case AV_PIX_FMT_YUV422P10LE:
+	case AV_PIX_FMT_YUV422P9BE:
+	case AV_PIX_FMT_YUV422P9LE:
+	case AV_PIX_FMT_YVYU422:
+	case AV_PIX_FMT_YUV422P12BE:
+	case AV_PIX_FMT_YUV422P12LE:
+	case AV_PIX_FMT_YUV422P14BE:
+	case AV_PIX_FMT_YUV422P14LE:
+		return AV_PIX_FMT_UYVY422;
+
+	case AV_PIX_FMT_NV12:
+	case AV_PIX_FMT_NV21:
+		return AV_PIX_FMT_NV12;
+
+	case AV_PIX_FMT_YUV420P:
+	case AV_PIX_FMT_YUVJ420P:
+	case AV_PIX_FMT_YUV411P:
+	case AV_PIX_FMT_UYYVYY411:
+	case AV_PIX_FMT_YUV410P:
+	case AV_PIX_FMT_YUV420P16LE:
+	case AV_PIX_FMT_YUV420P16BE:
+	case AV_PIX_FMT_YUV420P9BE:
+	case AV_PIX_FMT_YUV420P9LE:
+	case AV_PIX_FMT_YUV420P10BE:
+	case AV_PIX_FMT_YUV420P10LE:
+	case AV_PIX_FMT_YUV420P12BE:
+	case AV_PIX_FMT_YUV420P12LE:
+	case AV_PIX_FMT_YUV420P14BE:
+	case AV_PIX_FMT_YUV420P14LE:
+		return AV_PIX_FMT_YUV420P;
+
+	case AV_PIX_FMT_RGBA:
+	case AV_PIX_FMT_BGRA:
+	case AV_PIX_FMT_BGR0:
+		return fmt;
+
+	default:
+		break;
+	}
+
+	return AV_PIX_FMT_BGRA;
+}

obs-studio-18.0.2.tar.xz/deps/media-playback/media-playback/decode.c Added

@@ -0,0 +1,316 @@
+/*
+ * Copyright (c) 2017 Hugh Bailey <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "decode.h"
+#include "media.h"
+
+static AVCodec *find_hardware_decoder(enum AVCodecID id)
+{
+	AVHWAccel *hwa = av_hwaccel_next(NULL);
+	AVCodec *c = NULL;
+
+	while (hwa) {
+		if (hwa->id == id) {
+			if (hwa->pix_fmt == AV_PIX_FMT_VDA_VLD ||
+			    hwa->pix_fmt == AV_PIX_FMT_DXVA2_VLD ||
+			    hwa->pix_fmt == AV_PIX_FMT_VAAPI_VLD) {
+				c = avcodec_find_decoder_by_name(hwa->name);
+				if (c)
+					break;
+			}
+		}
+
+		hwa = av_hwaccel_next(hwa);
+	}
+
+	return c;
+}
+
+static int mp_open_codec(struct mp_decode *d)
+{
+	AVCodecContext *c;
+	int ret;
+
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
+	c = avcodec_alloc_context3(d->codec);
+	if (!c) {
+		blog(LOG_WARNING, "MP: Failed to allocate context");
+		return -1;
+	}
+
+	ret = avcodec_parameters_to_context(c, d->stream->codecpar);
+	if (ret < 0)
+		goto fail;
+#else
+	c = d->stream->codec;
+#endif
+
+	if (c->thread_count == 1 &&
+	    c->codec_id != AV_CODEC_ID_PNG &&
+	    c->codec_id != AV_CODEC_ID_TIFF &&
+	    c->codec_id != AV_CODEC_ID_JPEG2000 &&
+	    c->codec_id != AV_CODEC_ID_MPEG4 &&
+	    c->codec_id != AV_CODEC_ID_WEBP)
+		c->thread_count = 0;
+
+	ret = avcodec_open2(c, d->codec, NULL);
+	if (ret < 0)
+		goto fail;
+
+	d->decoder = c;
+	return ret;
+
+fail:
+	avcodec_close(c);
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
+	av_free(d->decoder);
+#endif
+	return ret;
+}
+
+bool mp_decode_init(mp_media_t *m, enum AVMediaType type, bool hw)
+{
+	struct mp_decode *d = type == AVMEDIA_TYPE_VIDEO ? &m->v : &m->a;
+	enum AVCodecID id;
+	AVStream *stream;
+	int ret;
+
+	memset(d, 0, sizeof(*d));
+	d->m = m;
+	d->audio = type == AVMEDIA_TYPE_AUDIO;
+
+	ret = av_find_best_stream(m->fmt, type, -1, -1, NULL, 0);
+	if (ret < 0)
+		return false;
+	stream = d->stream = m->fmt->streams[ret];
+
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
+	id = stream->codecpar->codec_id;
+#else
+	id = stream->codec->codec_id;
+#endif
+
+	if (hw) {
+		d->codec = find_hardware_decoder(id);
+		if (d->codec) {
+			ret = mp_open_codec(d);
+			if (ret < 0)
+				d->codec = NULL;
+		}
+	}
+
+	if (!d->codec) {
+		if (id == AV_CODEC_ID_VP8)
+			d->codec = avcodec_find_decoder_by_name("libvpx");
+		else if (id == AV_CODEC_ID_VP9)
+			d->codec = avcodec_find_decoder_by_name("libvpx-vp9");
+
+		if (!d->codec)
+			d->codec = avcodec_find_decoder(id);
+		if (!d->codec) {
+			blog(LOG_WARNING, "MP: Failed to find %s codec",
+					av_get_media_type_string(type));
+			return false;
+		}
+
+		ret = mp_open_codec(d);
+		if (ret < 0) {
+			blog(LOG_WARNING, "MP: Failed to open %s decoder: %s",
+					av_get_media_type_string(type),
+					av_err2str(ret));
+			return false;
+		}
+	}
+
+	d->frame = av_frame_alloc();
+	if (!d->frame) {
+		blog(LOG_WARNING, "MP: Failed to allocate %s frame",
+				av_get_media_type_string(type));
+		return false;
+	}
+
+	if (d->codec->capabilities & CODEC_CAP_TRUNCATED)
+		d->decoder->flags |= CODEC_FLAG_TRUNCATED;
+	return true;
+}
+
+void mp_decode_clear_packets(struct mp_decode *d)
+{
+	if (d->packet_pending) {
+		av_packet_unref(&d->orig_pkt);
+		d->packet_pending = false;
+	}
+
+	while (d->packets.size) {
+		AVPacket pkt;
+		circlebuf_pop_front(&d->packets, &pkt, sizeof(pkt));
+		av_packet_unref(&pkt);
+	}
+}
+
+void mp_decode_free(struct mp_decode *d)
+{
+	mp_decode_clear_packets(d);
+	circlebuf_free(&d->packets);
+
+	if (d->decoder) {
+		avcodec_close(d->decoder);
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
+		av_free(d->decoder);
+#endif
+	}
+
+	if (d->frame)
+		av_free(d->frame);
+
+	memset(d, 0, sizeof(*d));
+}
+
+void mp_decode_push_packet(struct mp_decode *decode, AVPacket *packet)
+{
+	circlebuf_push_back(&decode->packets, packet, sizeof(*packet));
+}
+
+static inline int64_t get_estimated_duration(struct mp_decode *d,
+		int64_t last_pts)
+{
+	if (last_pts)
+		return d->frame_pts - last_pts;
+
+	if (d->audio) {
+		return av_rescale_q(d->frame->nb_samples,
+				(AVRational){1, d->frame->sample_rate},
+				(AVRational){1, 1000000000});
+	} else {
+		if (d->last_duration)
+			return d->last_duration;

obs-studio-18.0.2.tar.xz/deps/media-playback/media-playback/decode.h Added

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017 Hugh Bailey <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <util/circlebuf.h>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4244)
+#pragma warning(disable : 4204)
+#endif
+
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <util/threading.h>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+struct mp_media;
+
+struct mp_decode {
+	struct mp_media       *m;
+	AVStream              *stream;
+	bool                  audio;
+
+	AVCodecContext        *decoder;
+	AVCodec               *codec;
+
+	int64_t               last_duration;
+	int64_t               frame_pts;
+	int64_t               next_pts;
+	AVFrame               *frame;
+	bool                  got_first_keyframe;
+	bool                  frame_ready;
+	bool                  eof;
+
+	AVPacket              orig_pkt;
+	AVPacket              pkt;
+	bool                  packet_pending;
+	struct circlebuf      packets;
+};
+
+extern bool mp_decode_init(struct mp_media *media, enum AVMediaType type,
+		bool hw);
+extern void mp_decode_free(struct mp_decode *decode);
+
+extern void mp_decode_clear_packets(struct mp_decode *decode);
+
+extern void mp_decode_push_packet(struct mp_decode *decode, AVPacket *pkt);
+extern bool mp_decode_next(struct mp_decode *decode);
+extern void mp_decode_flush(struct mp_decode *decode);
+
+#ifdef __cplusplus
+}
+#endif

obs-studio-18.0.2.tar.xz/deps/media-playback/media-playback/media.c Added

@@ -0,0 +1,679 @@
+/*
+ * Copyright (c) 2017 Hugh Bailey <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <obs.h>
+#include <util/platform.h>
+
+#include <assert.h>
+
+#include "media.h"
+#include "closest-format.h"
+
+#include <libavdevice/avdevice.h>
+#include <libavutil/imgutils.h>
+
+static int64_t base_sys_ts = 0;
+
+static inline enum video_format convert_pixel_format(int f)
+{
+	switch (f) {
+	case AV_PIX_FMT_NONE:    return VIDEO_FORMAT_NONE;
+	case AV_PIX_FMT_YUV420P: return VIDEO_FORMAT_I420;
+	case AV_PIX_FMT_NV12:    return VIDEO_FORMAT_NV12;
+	case AV_PIX_FMT_YUYV422: return VIDEO_FORMAT_YUY2;
+	case AV_PIX_FMT_UYVY422: return VIDEO_FORMAT_UYVY;
+	case AV_PIX_FMT_RGBA:    return VIDEO_FORMAT_RGBA;
+	case AV_PIX_FMT_BGRA:    return VIDEO_FORMAT_BGRA;
+	case AV_PIX_FMT_BGR0:    return VIDEO_FORMAT_BGRX;
+	default:;
+	}
+
+	return VIDEO_FORMAT_NONE;
+}
+
+static inline enum audio_format convert_sample_format(int f)
+{
+	switch (f) {
+	case AV_SAMPLE_FMT_U8:   return AUDIO_FORMAT_U8BIT;
+	case AV_SAMPLE_FMT_S16:  return AUDIO_FORMAT_16BIT;
+	case AV_SAMPLE_FMT_S32:  return AUDIO_FORMAT_32BIT;
+	case AV_SAMPLE_FMT_FLT:  return AUDIO_FORMAT_FLOAT;
+	case AV_SAMPLE_FMT_U8P:  return AUDIO_FORMAT_U8BIT_PLANAR;
+	case AV_SAMPLE_FMT_S16P: return AUDIO_FORMAT_16BIT_PLANAR;
+	case AV_SAMPLE_FMT_S32P: return AUDIO_FORMAT_32BIT_PLANAR;
+	case AV_SAMPLE_FMT_FLTP: return AUDIO_FORMAT_FLOAT_PLANAR;
+	default:;
+	}
+
+	return AUDIO_FORMAT_UNKNOWN;
+}
+
+static inline enum video_colorspace convert_color_space(enum AVColorSpace s)
+{
+	return s == AVCOL_SPC_BT709 ? VIDEO_CS_709 : VIDEO_CS_DEFAULT;
+}
+
+static inline enum video_range_type convert_color_range(enum AVColorRange r)
+{
+	return r == AVCOL_RANGE_JPEG ? VIDEO_RANGE_FULL : VIDEO_RANGE_DEFAULT;
+}
+
+static inline struct mp_decode *get_packet_decoder(mp_media_t *media,
+		AVPacket *pkt)
+{
+	if (media->has_audio && pkt->stream_index == media->a.stream->index)
+		return &media->a;
+	if (media->has_video && pkt->stream_index == media->v.stream->index)
+		return &media->v;
+
+	return NULL;
+}
+
+static int mp_media_next_packet(mp_media_t *media)
+{
+	AVPacket new_pkt;
+	AVPacket pkt;
+	av_init_packet(&pkt);
+	new_pkt = pkt;
+
+	int ret = av_read_frame(media->fmt, &pkt);
+	if (ret < 0) {
+		if (ret != AVERROR_EOF)
+			blog(LOG_WARNING, "MP: av_read_frame failed: %d", ret);
+		return ret;
+	}
+
+	struct mp_decode *d = get_packet_decoder(media, &pkt);
+	if (d && pkt.size) {
+		av_packet_ref(&new_pkt, &pkt);
+		mp_decode_push_packet(d, &new_pkt);
+	}
+
+	av_packet_unref(&pkt);
+	return ret;
+}
+
+static inline bool mp_media_ready_to_start(mp_media_t *m)
+{
+	if (m->has_audio && !m->a.eof && !m->a.frame_ready)
+		return false;
+	if (m->has_video && !m->v.eof && !m->v.frame_ready)
+		return false;
+	return true;
+}
+
+static inline bool mp_decode_frame(struct mp_decode *d)
+{
+	return d->frame_ready || mp_decode_next(d);
+}
+
+static inline int get_sws_colorspace(enum AVColorSpace cs)
+{
+	switch (cs) {
+	case AVCOL_SPC_BT709:
+		return SWS_CS_ITU709;
+	case AVCOL_SPC_FCC:
+		return SWS_CS_FCC;
+	case AVCOL_SPC_SMPTE170M:
+		return SWS_CS_SMPTE170M;
+	case AVCOL_SPC_SMPTE240M:
+		return SWS_CS_SMPTE240M;
+	default:
+		break;
+	}
+
+	return SWS_CS_ITU601;
+}
+
+static inline int get_sws_range(enum AVColorRange r)
+{
+	return r == AVCOL_RANGE_JPEG ? 1 : 0;
+}
+
+#define FIXED_1_0 (1<<16)
+
+static bool mp_media_init_scaling(mp_media_t *m)
+{
+	int space = get_sws_colorspace(m->v.decoder->colorspace);
+	int range = get_sws_range(m->v.decoder->color_range);
+	const int *coeff = sws_getCoefficients(space);
+
+	m->swscale = sws_getCachedContext(NULL,
+			m->v.decoder->width, m->v.decoder->height,
+			m->v.decoder->pix_fmt,
+			m->v.decoder->width, m->v.decoder->height,
+			m->scale_format,
+			SWS_FAST_BILINEAR, NULL, NULL, NULL);
+	if (!m->swscale) {
+		blog(LOG_WARNING, "MP: Failed to initialize scaler");
+		return false;
+	}
+
+	sws_setColorspaceDetails(m->swscale, coeff, range, coeff, range, 0,
+			FIXED_1_0, FIXED_1_0);
+
+	int ret = av_image_alloc(m->scale_pic, m->scale_linesizes,
+			m->v.decoder->width, m->v.decoder->height,
+			m->scale_format, 1);
+	if (ret < 0) {
+		blog(LOG_WARNING, "MP: Failed to create scale pic data");
+		return false;
+	}
+
+	return true;
+}
+
+static bool mp_media_prepare_frames(mp_media_t *m)
+{
+	while (!mp_media_ready_to_start(m)) {
+		if (!m->eof) {
+			int ret = mp_media_next_packet(m);
+			if (ret == AVERROR_EOF)
+				m->eof = true;
+			else if (ret < 0)
+				return false;
+		}
+
+		if (m->has_video && !mp_decode_frame(&m->v))
+			return false;
+		if (m->has_audio && !mp_decode_frame(&m->a))
+			return false;
+	}
+
+	if (m->has_video && m->v.frame_ready && !m->swscale) {
+		m->scale_format = closest_format(m->v.frame->format);
+		if (m->scale_format != m->v.frame->format) {
+			if (!mp_media_init_scaling(m)) {

obs-studio-18.0.2.tar.xz/deps/media-playback/media-playback/media.h Added

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2017 Hugh Bailey <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#include <obs.h>
+#include "decode.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4244)
+#pragma warning(disable : 4204)
+#endif
+
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
+#include <util/threading.h>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+typedef void (*mp_video_cb)(void *opaque, struct obs_source_frame *frame);
+typedef void (*mp_audio_cb)(void *opaque, struct obs_source_audio *audio);
+typedef void (*mp_stop_cb)(void *opaque);
+
+struct mp_media {
+	AVFormatContext *fmt;
+
+	mp_video_cb v_preload_cb;
+	mp_stop_cb stop_cb;
+	mp_video_cb v_cb;
+	mp_audio_cb a_cb;
+	void *opaque;
+
+	enum AVPixelFormat scale_format;
+	struct SwsContext *swscale;
+	int scale_linesizes[4];
+	uint8_t *scale_pic[4];
+
+	struct mp_decode v;
+	struct mp_decode a;
+	bool is_network;
+	bool has_video;
+	bool has_audio;
+	bool is_file;
+	bool eof;
+
+	struct obs_source_frame obsframe;
+	enum video_colorspace cur_space;
+	enum video_range_type cur_range;
+	enum video_range_type force_range;
+
+	int64_t play_sys_ts;
+	int64_t next_pts_ns;
+	uint64_t next_ns;
+	int64_t start_ts;
+	int64_t base_ts;
+
+	pthread_mutex_t mutex;
+	os_sem_t *sem;
+	bool stopping;
+	bool looping;
+	bool active;
+	bool reset;
+	bool kill;
+
+	bool thread_valid;
+	pthread_t thread;
+};
+
+typedef struct mp_media mp_media_t;
+
+extern bool mp_media_init(mp_media_t *media,
+		const char *path,
+		const char *format,
+		void *opaque,
+		mp_video_cb v_cb,
+		mp_audio_cb a_cb,
+		mp_stop_cb stop_cb,
+		mp_video_cb v_preload_cb,
+		bool hardware_decoding,
+		enum video_range_type force_range);
+extern void mp_media_free(mp_media_t *media);
+
+extern void mp_media_play(mp_media_t *media, bool loop);
+extern void mp_media_stop(mp_media_t *media);
+
+#ifdef __cplusplus
+}
+#endif

obs-studio-18.0.1.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-18.0.2.tar.xz/libobs-d3d11/d3d11-subsystem.cpp Changed

obs-studio-18.0.1.tar.xz/libobs-opengl/gl-stagesurf.c -> obs-studio-18.0.2.tar.xz/libobs-opengl/gl-stagesurf.c Changed

obs-studio-18.0.1.tar.xz/libobs-opengl/gl-subsystem.c -> obs-studio-18.0.2.tar.xz/libobs-opengl/gl-subsystem.c Changed

obs-studio-18.0.1.tar.xz/libobs-opengl/gl-windows.c -> obs-studio-18.0.2.tar.xz/libobs-opengl/gl-windows.c Changed

obs-studio-18.0.1.tar.xz/libobs-opengl/gl-x11.c -> obs-studio-18.0.2.tar.xz/libobs-opengl/gl-x11.c Changed

obs-studio-18.0.1.tar.xz/libobs/audio-monitoring/osx/coreaudio-enum-devices.c -> obs-studio-18.0.2.tar.xz/libobs/audio-monitoring/osx/coreaudio-enum-devices.c Changed

@@ -12,8 +12,8 @@
 	return (bool)CFStringGetCString(ref, buf, size, kCFStringEncodingUTF8);
 }
 
-static void obs_enum_audio_monitoring_device(obs_enum_audio_device_cb cb,
-		void *data, AudioDeviceID id)
+static bool obs_enum_audio_monitoring_device(obs_enum_audio_device_cb cb,
+		void *data, AudioDeviceID id, bool allow_inputs)
 {
 	UInt32      size    = 0;
 	CFStringRef cf_name = NULL;
@@ -21,6 +21,7 @@
 	char        name[1024];
 	char        uid[1024];
 	OSStatus    stat;
+	bool        cont = true;
 
 	AudioObjectPropertyAddress addr = {
 		kAudioDevicePropertyStreams,
@@ -29,16 +30,18 @@
 	};
 
 	/* check to see if it's a mac input device */
-	AudioObjectGetPropertyDataSize(id, &addr, 0, NULL, &size);
-	if (!size)
-		return;
+	if (!allow_inputs) {
+		AudioObjectGetPropertyDataSize(id, &addr, 0, NULL, &size);
+		if (!size)
+			return true;
+	}
 
 	size = sizeof(CFStringRef);
 
 	addr.mSelector = kAudioDevicePropertyDeviceUID;
 	stat = AudioObjectGetPropertyData(id, &addr, 0, NULL, &size, &cf_uid);
 	if (!success(stat, "get audio device UID"))
-		return;
+		return true;
 
 	addr.mSelector = kAudioDevicePropertyDeviceNameCFString;
 	stat = AudioObjectGetPropertyData(id, &addr, 0, NULL, &size, &cf_name);
@@ -55,16 +58,18 @@
 		goto fail;
 	}
 
-	cb(data, name, uid);
+	cont = cb(data, name, uid);
 
 fail:
 	if (cf_name)
 		CFRelease(cf_name);
 	if (cf_uid)
 		CFRelease(cf_uid);
+	return cont;
 }
 
-void obs_enum_audio_monitoring_devices(obs_enum_audio_device_cb cb, void *data)
+static void enum_audio_devices(obs_enum_audio_device_cb cb, void *data,
+		bool allow_inputs)
 {
 	AudioObjectPropertyAddress addr = {
 		kAudioHardwarePropertyDevices,
@@ -88,9 +93,104 @@
 	stat = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr,
 						0, NULL, &size, ids);
 	if (success(stat, "get data")) {
-		for (UInt32 i = 0; i < count; i++)
-			obs_enum_audio_monitoring_device(cb, data, ids[i]);
+		for (UInt32 i = 0; i < count; i++) {
+			if (!obs_enum_audio_monitoring_device(cb, data, ids[i],
+						allow_inputs))
+				break;
+		}
 	}
 
 	free(ids);
 }
+
+void obs_enum_audio_monitoring_devices(obs_enum_audio_device_cb cb, void *data)
+{
+	enum_audio_devices(cb, data, false);
+}
+
+static bool alloc_default_id(void *data, const char *name, const char *id)
+{
+	char **p_id = data;
+	UNUSED_PARAMETER(name);
+
+	*p_id = bstrdup(id);
+	return false;
+}
+
+static void get_default_id(char **p_id)
+{
+	AudioObjectPropertyAddress addr = {
+		kAudioHardwarePropertyDefaultSystemOutputDevice,
+		kAudioObjectPropertyScopeGlobal,
+		kAudioObjectPropertyElementMaster
+	};
+
+	if (*p_id)
+		return;
+
+	OSStatus      stat;
+	AudioDeviceID id = 0;
+	UInt32        size = sizeof(id);
+
+	stat = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0,
+			NULL, &size, &id);
+	if (success(stat, "AudioObjectGetPropertyData"))
+		obs_enum_audio_monitoring_device(alloc_default_id, p_id, id,
+				true);
+	if (!*p_id)
+		*p_id = bzalloc(1);
+}
+
+struct device_name_info {
+	const char *id;
+	char *name;
+};
+
+static bool enum_device_name(void *data, const char *name, const char *id)
+{
+	struct device_name_info *info = data;
+
+	if (strcmp(info->id, id) == 0) {
+		info->name = bstrdup(name);
+		return false;
+	}
+
+	return true;
+}
+
+bool devices_match(const char *id1, const char *id2)
+{
+	struct device_name_info info = {0};
+	char *default_id = NULL;
+	char *name1 = NULL;
+	char *name2 = NULL;
+	bool match;
+
+	if (!id1 || !id2)
+		return false;
+
+	if (strcmp(id1, "default") == 0) {
+		get_default_id(&default_id);
+		id1 = default_id;
+	}
+	if (strcmp(id2, "default") == 0) {
+		get_default_id(&default_id);
+		id2 = default_id;
+	}
+
+	info.id = id1;
+	enum_audio_devices(enum_device_name, &info, true);
+	name1 = info.name;
+
+	info.name = NULL;
+	info.id = id2;
+	enum_audio_devices(enum_device_name, &info, true);
+	name2 = info.name;
+
+	match = name1 && name2 && strcmp(name1, name2) == 0;
+	bfree(default_id);
+	bfree(name1);
+	bfree(name2);
+
+	return match;
+}

obs-studio-18.0.1.tar.xz/libobs/audio-monitoring/osx/coreaudio-output.c -> obs-studio-18.0.2.tar.xz/libobs/audio-monitoring/osx/coreaudio-output.c Changed

@@ -27,6 +27,7 @@
 
 	volatile bool         active;
 	bool                  paused;
+	bool                  ignore;
 };
 
 static inline bool fill_buffer(struct audio_monitor *monitor)
@@ -137,7 +138,10 @@
 	UNUSED_PARAMETER(aq);
 }
 
-static bool audio_monitor_init(struct audio_monitor *monitor)
+extern bool devices_match(const char *id1, const char *id2);
+
+static bool audio_monitor_init(struct audio_monitor *monitor,
+		obs_source_t *source)
 {
 	const struct audio_output_info *info = audio_output_get_info(
 			obs->audio.audio);
@@ -156,6 +160,8 @@
 		.mBitsPerChannel = sizeof(float) * 8
 	};
 
+	monitor->source = source;
+
 	monitor->channels = channels;
 	monitor->buffer_size =
 		channels * sizeof(float) * info->samples_per_sec / 100 * 3;
@@ -163,14 +169,26 @@
 
 	pthread_mutex_init_value(&monitor->mutex);
 
-	stat = AudioQueueNewOutput(&desc, buffer_audio, monitor, NULL, NULL, 0,
-			&monitor->queue);
-	if (!success(stat, "AudioStreamBasicDescription")) {
+	const char *uid = obs->audio.monitoring_device_id;
+	if (!uid || !*uid) {
 		return false;
 	}
 
-	const char *uid = obs->audio.monitoring_device_id;
-	if (!uid || !*uid) {
+	if (source->info.output_flags & OBS_SOURCE_DO_NOT_SELF_MONITOR) {
+		obs_data_t *s = obs_source_get_settings(source);
+		const char *s_dev_id = obs_data_get_string(s, "device_id");
+		bool match = devices_match(s_dev_id, uid);
+		obs_data_release(s);
+
+		if (match) {
+			monitor->ignore = true;
+			return true;
+		}
+	}
+
+	stat = AudioQueueNewOutput(&desc, buffer_audio, monitor, NULL, NULL, 0,
+			&monitor->queue);
+	if (!success(stat, "AudioStreamBasicDescription")) {
 		return false;
 	}
 
@@ -266,19 +284,20 @@
 	pthread_mutex_destroy(&monitor->mutex);
 }
 
-static void audio_monitor_init_final(struct audio_monitor *monitor,
-		obs_source_t *source)
+static void audio_monitor_init_final(struct audio_monitor *monitor)
 {
-	monitor->source = source;
-	obs_source_add_audio_capture_callback(source, on_audio_playback,
-			monitor);
+	if (monitor->ignore)
+		return;
+
+	obs_source_add_audio_capture_callback(monitor->source,
+			on_audio_playback, monitor);
 }
 
 struct audio_monitor *audio_monitor_create(obs_source_t *source)
 {
 	struct audio_monitor *monitor = bzalloc(sizeof(*monitor));
 
-	if (!audio_monitor_init(monitor)) {
+	if (!audio_monitor_init(monitor, source)) {
 		goto fail;
 	}
 
@@ -286,7 +305,7 @@
 	da_push_back(obs->audio.monitors, &monitor);
 	pthread_mutex_unlock(&obs->audio.monitoring_mutex);
 
-	audio_monitor_init_final(monitor, source);
+	audio_monitor_init_final(monitor);
 	return monitor;
 
 fail:
@@ -303,9 +322,9 @@
 	audio_monitor_free(monitor);
 	memset(monitor, 0, sizeof(*monitor));
 
-	success = audio_monitor_init(monitor);
+	success = audio_monitor_init(monitor, source);
 	if (success)
-		audio_monitor_init_final(monitor, source);
+		audio_monitor_init_final(monitor);
 }
 
 void audio_monitor_destroy(struct audio_monitor *monitor)

obs-studio-18.0.1.tar.xz/libobs/audio-monitoring/win32/wasapi-enum-devices.c -> obs-studio-18.0.2.tar.xz/libobs/audio-monitoring/win32/wasapi-enum-devices.c Changed

@@ -103,3 +103,66 @@
 	safe_release(enumerator);
 	safe_release(collection);
 }
+
+static void get_default_id(char **p_id)
+{
+	IMMDeviceEnumerator *immde = NULL;
+	IMMDevice *device = NULL;
+	WCHAR *w_id = NULL;
+	HRESULT hr;
+
+	if (*p_id)
+		return;
+
+	hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
+			&IID_IMMDeviceEnumerator, &immde);
+	if (FAILED(hr)) {
+		goto fail;
+	}
+
+	hr = immde->lpVtbl->GetDefaultAudioEndpoint(immde,
+			eRender, eConsole, &device);
+	if (FAILED(hr)) {
+		goto fail;
+	}
+
+	hr = device->lpVtbl->GetId(device, &w_id);
+	if (FAILED(hr)) {
+		goto fail;
+	}
+
+	os_wcs_to_utf8_ptr(w_id, 0, p_id);
+
+fail:
+	if (!*p_id)
+		*p_id = bzalloc(1);
+	if (immde)
+		immde->lpVtbl->Release(immde);
+	if (device)
+		device->lpVtbl->Release(device);
+	if (w_id)
+		CoTaskMemFree(w_id);
+}
+
+bool devices_match(const char *id1, const char *id2)
+{
+	char *default_id = NULL;
+	bool match;
+
+	if (!id1 || !id2)
+		return false;
+
+	if (strcmp(id1, "default") == 0) {
+		get_default_id(&default_id);
+		id1 = default_id;
+	}
+	if (strcmp(id2, "default") == 0) {
+		get_default_id(&default_id);
+		id2 = default_id;
+	}
+
+	match = strcmp(id1, id2) == 0;
+	bfree(default_id);
+
+	return match;
+}

obs-studio-18.0.1.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c -> obs-studio-18.0.2.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c Changed

@@ -36,6 +36,7 @@
 	uint32_t           sample_rate;
 	uint32_t           channels;
 	bool               source_has_video : 1;
+	bool               ignore : 1;
 
 	int64_t            lowest_audio_offset;
 	struct circlebuf   delay_buffer;
@@ -203,6 +204,9 @@
 
 static inline void audio_monitor_free(struct audio_monitor *monitor)
 {
+	if (monitor->ignore)
+		return;
+
 	if (monitor->source) {
 		obs_source_remove_audio_capture_callback(
 				monitor->source, on_audio_playback, monitor);
@@ -235,7 +239,10 @@
 	return (enum speaker_layout)channels;
 }
 
-static bool audio_monitor_init(struct audio_monitor *monitor)
+extern bool devices_match(const char *id1, const char *id2);
+
+static bool audio_monitor_init(struct audio_monitor *monitor,
+		obs_source_t *source)
 {
 	IMMDeviceEnumerator *immde = NULL;
 	WAVEFORMATEX *wfex = NULL;
@@ -243,12 +250,26 @@
 	UINT32 frames;
 	HRESULT hr;
 
+	pthread_mutex_init_value(&monitor->playback_mutex);
+
+	monitor->source = source;
+
 	const char *id = obs->audio.monitoring_device_id;
 	if (!id) {
 		return false;
 	}
 
-	pthread_mutex_init_value(&monitor->playback_mutex);
+	if (source->info.output_flags & OBS_SOURCE_DO_NOT_SELF_MONITOR) {
+		obs_data_t *s = obs_source_get_settings(source);
+		const char *s_dev_id = obs_data_get_string(s, "device_id");
+		bool match = devices_match(s_dev_id, id);
+		obs_data_release(s);
+
+		if (match) {
+			monitor->ignore = true;
+			return true;
+		}
+	}
 
 	/* ------------------------------------------ *
 	 * Init device                                */
@@ -352,14 +373,15 @@
 	return success;
 }
 
-static void audio_monitor_init_final(struct audio_monitor *monitor,
-		obs_source_t *source)
+static void audio_monitor_init_final(struct audio_monitor *monitor)
 {
-	monitor->source = source;
+	if (monitor->ignore)
+		return;
+
 	monitor->source_has_video =
-		(source->info.output_flags & OBS_SOURCE_VIDEO) != 0;
-	obs_source_add_audio_capture_callback(source, on_audio_playback,
-			monitor);
+		(monitor->source->info.output_flags & OBS_SOURCE_VIDEO) != 0;
+	obs_source_add_audio_capture_callback(monitor->source,
+			on_audio_playback, monitor);
 }
 
 struct audio_monitor *audio_monitor_create(obs_source_t *source)
@@ -367,7 +389,7 @@
 	struct audio_monitor monitor = {0};
 	struct audio_monitor *out;
 
-	if (!audio_monitor_init(&monitor)) {
+	if (!audio_monitor_init(&monitor, source)) {
 		goto fail;
 	}
 
@@ -377,7 +399,7 @@
 	da_push_back(obs->audio.monitors, &out);
 	pthread_mutex_unlock(&obs->audio.monitoring_mutex);
 
-	audio_monitor_init_final(out, source);
+	audio_monitor_init_final(out);
 	return out;
 
 fail:
@@ -391,14 +413,14 @@
 	bool success;
 
 	pthread_mutex_lock(&monitor->playback_mutex);
-	success = audio_monitor_init(&new_monitor);
+	success = audio_monitor_init(&new_monitor, monitor->source);
 	pthread_mutex_unlock(&monitor->playback_mutex);
 
 	if (success) {
 		obs_source_t *source = monitor->source;
 		audio_monitor_free(monitor);
 		*monitor = new_monitor;
-		audio_monitor_init_final(monitor, source);
+		audio_monitor_init_final(monitor);
 	} else {
 		audio_monitor_free(&new_monitor);
 	}

obs-studio-18.0.1.tar.xz/libobs/callback/calldata.h -> obs-studio-18.0.2.tar.xz/libobs/callback/calldata.h Changed

obs-studio-18.0.1.tar.xz/libobs/callback/decl.c -> obs-studio-18.0.2.tar.xz/libobs/callback/decl.c Changed

obs-studio-18.0.1.tar.xz/libobs/graphics/graphics.h -> obs-studio-18.0.2.tar.xz/libobs/graphics/graphics.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-audio-controls.h -> obs-studio-18.0.2.tar.xz/libobs/obs-audio-controls.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-audio.c -> obs-studio-18.0.2.tar.xz/libobs/obs-audio.c Changed

obs-studio-18.0.1.tar.xz/libobs/obs-config.h -> obs-studio-18.0.2.tar.xz/libobs/obs-config.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-encoder.h -> obs-studio-18.0.2.tar.xz/libobs/obs-encoder.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-hotkey.h -> obs-studio-18.0.2.tar.xz/libobs/obs-hotkey.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-internal.h -> obs-studio-18.0.2.tar.xz/libobs/obs-internal.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-module.h -> obs-studio-18.0.2.tar.xz/libobs/obs-module.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-output.c -> obs-studio-18.0.2.tar.xz/libobs/obs-output.c Changed

obs-studio-18.0.1.tar.xz/libobs/obs-scene.h -> obs-studio-18.0.2.tar.xz/libobs/obs-scene.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs-source.c -> obs-studio-18.0.2.tar.xz/libobs/obs-source.c Changed

@@ -330,6 +330,8 @@
 	if (!private)
 		obs_source_init_audio_hotkeys(source);
 
+	source->flags = source->default_flags;
+
 	/* allow the source to be created even if creation fails so that the
 	 * user's data doesn't become lost */
 	if (info)
@@ -342,7 +344,6 @@
 			private ? "private " : "", name, id);
 	obs_source_dosignal(source, "source_create", NULL);
 
-	source->flags = source->default_flags;
 	source->enabled = true;
 	return source;
 
@@ -365,6 +366,27 @@
 	return obs_source_create_internal(id, name, settings, NULL, true);
 }
 
+static char *get_new_filter_name(obs_source_t *dst, const char *name)
+{
+	struct dstr new_name = {0};
+	int inc = 0;
+
+	dstr_copy(&new_name, name);
+
+	for (;;) {
+		obs_source_t *existing_filter = obs_source_get_filter_by_name(
+				dst, new_name.array);
+		if (!existing_filter)
+			break;
+
+		obs_source_release(existing_filter);
+
+		dstr_printf(&new_name, "%s %d", name, ++inc + 1);
+	}
+
+	return new_name.array;
+}
+
 static void duplicate_filters(obs_source_t *dst, obs_source_t *src,
 		bool private)
 {
@@ -380,9 +402,13 @@
 
 	for (size_t i = filters.num; i > 0; i--) {
 		obs_source_t *src_filter = filters.array[i - 1];
+		char *new_name = get_new_filter_name(dst,
+				src_filter->context.name);
+
 		obs_source_t *dst_filter = obs_source_duplicate(src_filter,
-				src_filter->context.name, private);
+				new_name, private);
 
+		bfree(new_name);
 		obs_source_filter_add(dst, dst_filter);
 		obs_source_release(dst_filter);
 		obs_source_release(src_filter);
@@ -391,6 +417,15 @@
 	da_free(filters);
 }
 
+void obs_source_copy_filters(obs_source_t *dst, obs_source_t *src)
+{
+	duplicate_filters(dst, src, dst->context.private ?
+					OBS_SCENE_DUP_PRIVATE_COPY :
+					OBS_SCENE_DUP_COPY);
+
+	obs_source_release(src);
+}
+
 obs_source_t *obs_source_duplicate(obs_source_t *source,
 		const char *new_name, bool create_private)
 {
@@ -532,6 +567,8 @@
 	audio_resampler_destroy(source->resampler);
 	bfree(source->audio_output_buf[0][0]);
 
+	obs_source_frame_destroy(source->async_preload_frame);
+
 	if (source->info.type == OBS_SOURCE_TYPE_TRANSITION)
 		obs_transition_free(source);
 
@@ -1037,6 +1074,7 @@
 
 	source->last_audio_input_buf_size = 0;
 	source->audio_ts = os_time;
+	source->next_audio_sys_ts_min = os_time;
 }
 
 static void handle_ts_jump(obs_source_t *source, uint64_t expected,
@@ -2313,6 +2351,62 @@
 	}
 }
 
+static inline bool preload_frame_changed(obs_source_t *source,
+		const struct obs_source_frame *in)
+{
+	if (!source->async_preload_frame)
+		return true;
+
+	return in->width  != source->async_preload_frame->width  ||
+	       in->height != source->async_preload_frame->height ||
+	       in->format != source->async_preload_frame->format;
+}
+
+void obs_source_preload_video(obs_source_t *source,
+		const struct obs_source_frame *frame)
+{
+	if (!obs_source_valid(source, "obs_source_preload_video"))
+		return;
+	if (!frame)
+		return;
+
+	obs_enter_graphics();
+
+	if (preload_frame_changed(source, frame)) {
+		obs_source_frame_destroy(source->async_preload_frame);
+		source->async_preload_frame = obs_source_frame_create(
+				frame->format,
+				frame->width,
+				frame->height);
+	}
+
+	copy_frame_data(source->async_preload_frame, frame);
+	set_async_texture_size(source, source->async_preload_frame);
+	update_async_texture(source, source->async_preload_frame,
+			source->async_texture,
+			source->async_texrender);
+
+	source->last_frame_ts = frame->timestamp;
+
+	obs_leave_graphics();
+}
+
+void obs_source_show_preloaded_video(obs_source_t *source)
+{
+	uint64_t sys_ts;
+
+	if (!obs_source_valid(source, "obs_source_show_preloaded_video"))
+		return;
+
+	source->async_active = true;
+
+	pthread_mutex_lock(&source->audio_buf_mutex);
+	sys_ts = os_gettime_ns();
+	reset_audio_timing(source, source->last_frame_ts, sys_ts);
+	reset_audio_data(source, sys_ts);
+	pthread_mutex_unlock(&source->audio_buf_mutex);
+}
+
 static inline struct obs_audio_data *filter_async_audio(obs_source_t *source,
 		struct obs_audio_data *in)
 {
@@ -3903,8 +3997,6 @@
 
 	if (!obs_source_valid(source, "obs_source_set_monitoring_type"))
 		return;
-	if (source->info.output_flags & OBS_SOURCE_DO_NOT_MONITOR)
-		return;
 	if (source->monitoring_type == type)
 		return;

obs-studio-18.0.1.tar.xz/libobs/obs-source.h -> obs-studio-18.0.2.tar.xz/libobs/obs-source.h Changed

@@ -123,10 +123,12 @@
 /**
  * Source cannot have its audio monitored
  *
- * Specifies that this source may cause a feedback loop if audio is monitored.
+ * Specifies that this source may cause a feedback loop if audio is monitored
+ * with a device selected as desktop audio.
+ *
  * This is used primarily with desktop audio capture sources.
  */
-#define OBS_SOURCE_DO_NOT_MONITOR (1<<9)
+#define OBS_SOURCE_DO_NOT_SELF_MONITOR (1<<9)
 
 /** @} */
 
@@ -171,7 +173,7 @@
 	 * Creates the source data for the source
 	 *
 	 * @param  settings  Settings to initialize the source with
-	 * @param  source    Source that this data is assoicated with
+	 * @param  source    Source that this data is associated with
 	 * @return           The data associated with this source
 	 */
 	void *(*create)(obs_data_t *settings, obs_source_t *source);
@@ -257,7 +259,7 @@
 	 * If the source output flags do not include SOURCE_CUSTOM_DRAW, all
 	 * a source needs to do is set the "image" parameter of the effect to
 	 * the desired texture, and then draw.  If the output flags include
-	 * SOURCE_COLOR_MATRIX, you may optionally set the the "color_matrix"
+	 * SOURCE_COLOR_MATRIX, you may optionally set the "color_matrix"
 	 * parameter of the effect to a custom 4x4 conversion matrix (by
 	 * default it will be set to an YUV->RGB conversion matrix)
 	 *
@@ -429,7 +431,7 @@
 		size_t size);
 
 /**
- * Regsiters a source definition to the current obs context.  This should be
+ * Registers a source definition to the current obs context.  This should be
  * used in obs_module_load.
  *
  * @param  info  Pointer to the source definition structure

obs-studio-18.0.1.tar.xz/libobs/obs-ui.h -> obs-studio-18.0.2.tar.xz/libobs/obs-ui.h Changed

obs-studio-18.0.1.tar.xz/libobs/obs.c -> obs-studio-18.0.2.tar.xz/libobs/obs.c Changed

@@ -818,9 +818,6 @@
 	} while (false)
 
 	FREE_REGISTERED_TYPES(obs_source_info, obs->source_types);
-	FREE_REGISTERED_TYPES(obs_source_info, obs->input_types);
-	FREE_REGISTERED_TYPES(obs_source_info, obs->filter_types);
-	FREE_REGISTERED_TYPES(obs_source_info, obs->transition_types);
 	FREE_REGISTERED_TYPES(obs_output_info, obs->output_types);
 	FREE_REGISTERED_TYPES(obs_encoder_info, obs->encoder_types);
 	FREE_REGISTERED_TYPES(obs_service_info, obs->service_types);
@@ -829,6 +826,10 @@
 
 #undef FREE_REGISTERED_TYPES
 
+	da_free(obs->input_types);
+	da_free(obs->filter_types);
+	da_free(obs->transition_types);
+
 	stop_video();
 	stop_hotkeys();
 
@@ -1464,7 +1465,6 @@
 	obs_data_t   *hotkeys  = obs_data_get_obj(source_data, "hotkeys");
 	double       volume;
 	int64_t      sync;
-	uint32_t     flags;
 	uint32_t     mixers;
 	int          di_order;
 	int          di_mode;
@@ -1485,10 +1485,6 @@
 	mixers = (uint32_t)obs_data_get_int(source_data, "mixers");
 	obs_source_set_audio_mixers(source, mixers);
 
-	obs_data_set_default_int(source_data, "flags", source->default_flags);
-	flags = (uint32_t)obs_data_get_int(source_data, "flags");
-	obs_source_set_flags(source, flags);
-
 	obs_data_set_default_bool(source_data, "enabled", true);
 	obs_source_set_enabled(source,
 			obs_data_get_bool(source_data, "enabled"));
@@ -1611,7 +1607,6 @@
 	float      volume      = obs_source_get_volume(source);
 	uint32_t   mixers      = obs_source_get_audio_mixers(source);
 	int64_t    sync        = obs_source_get_sync_offset(source);
-	uint32_t   flags       = obs_source_get_flags(source);
 	const char *name       = obs_source_get_name(source);
 	const char *id         = obs_source_get_id(source);
 	bool       enabled     = obs_source_enabled(source);
@@ -1639,7 +1634,6 @@
 	obs_data_set_obj   (source_data, "settings", settings);
 	obs_data_set_int   (source_data, "mixers",   mixers);
 	obs_data_set_int   (source_data, "sync",     sync);
-	obs_data_set_int   (source_data, "flags",    flags);
 	obs_data_set_double(source_data, "volume",   volume);
 	obs_data_set_bool  (source_data, "enabled",  enabled);
 	obs_data_set_bool  (source_data, "muted",    muted);

obs-studio-18.0.1.tar.xz/libobs/obs.h -> obs-studio-18.0.2.tar.xz/libobs/obs.h Changed

@@ -279,15 +279,15 @@
 EXPORT profiler_name_store_t *obs_get_profiler_name_store(void);
 
 /**
- * Sets base video ouput base resolution/fps/format.
+ * Sets base video output base resolution/fps/format.
  *
- * @note This data cannot be changed if an output is corrently active.
+ * @note This data cannot be changed if an output is currently active.
  * @note The graphics module cannot be changed without fully destroying the
  *       OBS context.
  *
  * @param   ovi  Pointer to an obs_video_info structure containing the
  *               specification of the graphics subsystem,
- * @return       OBS_VIDEO_SUCCESS if sucessful
+ * @return       OBS_VIDEO_SUCCESS if successful
  *               OBS_VIDEO_NOT_SUPPORTED if the adapter lacks capabilities
  *               OBS_VIDEO_INVALID_PARAM if a parameter is invalid
  *               OBS_VIDEO_CURRENTLY_ACTIVE if video is currently active
@@ -335,7 +335,7 @@
 
 /**
  * Initializes the module, which calls its obs_module_load export.  If the
- * module is alrady loaded, then this function does nothing and returns
+ * module is already loaded, then this function does nothing and returns
  * successful.
  */
 EXPORT bool obs_init_module(obs_module_t *module);
@@ -869,6 +869,8 @@
 EXPORT obs_source_t *obs_source_get_filter_by_name(obs_source_t *source,
 		const char *name);
 
+EXPORT void obs_source_copy_filters(obs_source_t *dst, obs_source_t *src);
+
 EXPORT bool obs_source_enabled(const obs_source_t *source);
 EXPORT void obs_source_set_enabled(obs_source_t *source, bool enabled);
 
@@ -974,6 +976,13 @@
 EXPORT void obs_source_output_video(obs_source_t *source,
 		const struct obs_source_frame *frame);
 
+/** Preloads asynchronous video data to allow instantaneous playback */
+EXPORT void obs_source_preload_video(obs_source_t *source,
+		const struct obs_source_frame *frame);
+
+/** Shows any preloaded video data */
+EXPORT void obs_source_show_preloaded_video(obs_source_t *source);
+
 /** Outputs audio data (always asynchronous) */
 EXPORT void obs_source_output_audio(obs_source_t *source,
 		const struct obs_source_audio *audio);
@@ -1162,7 +1171,7 @@
  * Creates a scene.
  *
  *   A scene is a source which is a container of other sources with specific
- * display oriantations.  Scenes can also be used like any other source.
+ * display orientations.  Scenes can also be used like any other source.
  */
 EXPORT obs_scene_t *obs_scene_create(const char *name);
 
@@ -1224,7 +1233,7 @@
 EXPORT void obs_sceneitem_select(obs_sceneitem_t *item, bool select);
 EXPORT bool obs_sceneitem_selected(const obs_sceneitem_t *item);
 
-/* Functions for gettings/setting specific orientation of a scene item */
+/* Functions for getting/setting specific orientation of a scene item */
 EXPORT void obs_sceneitem_set_pos(obs_sceneitem_t *item, const struct vec2 *pos);
 EXPORT void obs_sceneitem_set_rot(obs_sceneitem_t *item, float rot_deg);
 EXPORT void obs_sceneitem_set_scale(obs_sceneitem_t *item,
@@ -1389,12 +1398,6 @@
 EXPORT proc_handler_t *obs_output_get_proc_handler(const obs_output_t *output);
 
 /**
- * Sets the current video media context associated with this output,
- * required for non-encoded outputs
- */
-EXPORT void obs_output_set_video(obs_output_t *output, video_t *video);
-
-/**
  * Sets the current audio/video media contexts associated with this output,
  * required for non-encoded outputs.  Can be null.
  */

obs-studio-18.0.1.tar.xz/libobs/util/base.h -> obs-studio-18.0.2.tar.xz/libobs/util/base.h Changed

obs-studio-18.0.1.tar.xz/libobs/util/c99defs.h -> obs-studio-18.0.2.tar.xz/libobs/util/c99defs.h Changed

obs-studio-18.0.1.tar.xz/libobs/util/cf-lexer.h -> obs-studio-18.0.2.tar.xz/libobs/util/cf-lexer.h Changed

obs-studio-18.0.1.tar.xz/libobs/util/config-file.h -> obs-studio-18.0.2.tar.xz/libobs/util/config-file.h Changed

obs-studio-18.0.1.tar.xz/libobs/util/darray.h -> obs-studio-18.0.2.tar.xz/libobs/util/darray.h Changed

obs-studio-18.0.1.tar.xz/libobs/util/text-lookup.h -> obs-studio-18.0.2.tar.xz/libobs/util/text-lookup.h Changed

obs-studio-18.0.1.tar.xz/libobs/util/utf8.c -> obs-studio-18.0.2.tar.xz/libobs/util/utf8.c Changed

obs-studio-18.0.1.tar.xz/libobs/util/vc/vc_stdint.h -> obs-studio-18.0.2.tar.xz/libobs/util/vc/vc_stdint.h Changed

obs-studio-18.0.2.tar.xz/plugins/decklink/audio-repack.c Added

@@ -0,0 +1,114 @@
+#include "audio-repack.h"
+
+#include <emmintrin.h>
+
+int check_buffer(struct audio_repack *repack,
+		uint32_t frame_count)
+{
+	const uint32_t new_size = frame_count * repack->base_dst_size
+			+ repack->extra_dst_size;
+
+	if (repack->packet_size < new_size) {
+		repack->packet_buffer = brealloc(
+				repack->packet_buffer, new_size);
+		if (!repack->packet_buffer)
+			return -1;
+
+		repack->packet_size = new_size;
+	}
+
+	return 0;
+}
+
+/*
+	Swap channel between LFE and FC, and
+	squash data array
+
+	| FL | FR |LFE | FC | BL | BR |emp |emp |
+    |    |       x      |    |
+	| FL | FR | FC |LFE | BL | BR |
+ */
+int repack_8to6ch_swap23(struct audio_repack *repack,
+		const uint8_t *bsrc, uint32_t frame_count)
+{
+	if (check_buffer(repack, frame_count) < 0)
+		return -1;
+
+	const uint32_t size = frame_count * repack->base_src_size;
+
+	const __m128i *src = (__m128i *)bsrc;
+	const __m128i *esrc = src + frame_count;
+	uint32_t *dst = (uint32_t *)repack->packet_buffer;
+	while (src != esrc) {
+		__m128i target = _mm_load_si128(src++);
+		__m128i buf = _mm_shufflelo_epi16(target, _MM_SHUFFLE(2, 3, 1, 0));
+		_mm_storeu_si128((__m128i *)dst, buf);
+		dst += 3;
+	}
+
+	return 0;
+}
+
+/*
+	Swap channel between LFE and FC
+
+	| FL | FR |LFE | FC | BL | BR |SBL |SBR |
+	  |    |       x      |    |    |    |
+	| FL | FR | FC |LFE | BL | BR |SBL |SBR |
+ */
+int repack_8ch_swap23(struct audio_repack *repack,
+		const uint8_t *bsrc, uint32_t frame_count)
+{
+	if (check_buffer(repack, frame_count) < 0)
+		return -1;
+
+	const uint32_t size = frame_count * repack->base_src_size;
+
+	const __m128i *src = (__m128i *)bsrc;
+	const __m128i *esrc = src + frame_count;
+	__m128i *dst = (__m128i *)repack->packet_buffer;
+	while (src != esrc) {
+		__m128i target = _mm_load_si128(src++);
+		__m128i buf = _mm_shufflelo_epi16(target, _MM_SHUFFLE(2, 3, 1, 0));
+		_mm_store_si128(dst++, buf);
+	}
+
+	return 0;
+}
+
+int audio_repack_init(struct audio_repack *repack,
+		audio_repack_mode_t repack_mode, uint8_t sample_bit)
+{
+	memset(repack, 0, sizeof(*repack));
+
+	if (sample_bit != 16)
+		return -1;
+
+	switch (repack_mode) {
+	case repack_mode_8to6ch_swap23:
+		repack->base_src_size  = 8 * (16 / 8);
+		repack->base_dst_size  = 6 * (16 / 8);
+		repack->extra_dst_size = 2;
+		repack->repack_func    = &repack_8to6ch_swap23;
+		break;
+
+	case repack_mode_8ch_swap23:
+		repack->base_src_size  = 8 * (16 / 8);
+		repack->base_dst_size  = 8 * (16 / 8);
+		repack->extra_dst_size = 0;
+		repack->repack_func    = &repack_8ch_swap23;
+		break;
+
+	default: return -1;
+	}
+
+	return 0;
+}
+
+void audio_repack_free(struct audio_repack *repack)
+{
+	if (repack->packet_buffer)
+		bfree(repack->packet_buffer);
+
+	memset(repack, 0, sizeof(*repack));
+}

obs-studio-18.0.2.tar.xz/plugins/decklink/audio-repack.h Added

obs-studio-18.0.2.tar.xz/plugins/decklink/audio-repack.hpp Added

obs-studio-18.0.1.tar.xz/plugins/decklink/data/locale/en-US.ini -> obs-studio-18.0.2.tar.xz/plugins/decklink/data/locale/en-US.ini Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/decklink-device-instance.cpp -> obs-studio-18.0.2.tar.xz/plugins/decklink/decklink-device-instance.cpp Changed

@@ -1,4 +1,5 @@
 #include "decklink-device-instance.hpp"
+#include "audio-repack.hpp"
 
 #include <util/platform.h>
 #include <util/threading.h>
@@ -8,6 +9,8 @@
 #define LOG(level, message, ...) blog(level, "%s: " message, \
 		obs_source_get_name(this->decklink->GetSource()), ##__VA_ARGS__)
 
+#define ISSTEREO(flag) ((flag) == SPEAKERS_STEREO)
+
 static inline enum video_format ConvertPixelFormat(BMDPixelFormat format)
 {
 	switch (format) {
@@ -20,6 +23,36 @@
 	return VIDEO_FORMAT_UYVY;
 }
 
+static inline int ConvertChannelFormat(speaker_layout format)
+{
+	switch (format) {
+	case SPEAKERS_5POINT1:
+	case SPEAKERS_5POINT1_SURROUND:
+	case SPEAKERS_7POINT1:
+		return 8;
+
+	default:
+	case SPEAKERS_STEREO:
+		return 2;
+	}
+}
+
+static inline audio_repack_mode_t ConvertRepackFormat(speaker_layout format)
+{
+	switch (format) {
+	case SPEAKERS_5POINT1:
+	case SPEAKERS_5POINT1_SURROUND:
+		return repack_mode_8to6ch_swap23;
+
+	case SPEAKERS_7POINT1:
+		return repack_mode_8ch_swap23;
+
+	default:
+		assert(false && "No repack requested");
+		return (audio_repack_mode_t)-1;
+	}
+}
+
 DeckLinkDeviceInstance::DeckLinkDeviceInstance(DeckLink *decklink_,
 		DeckLinkDevice *device_) :
 	currentFrame(), currentPacket(), decklink(decklink_), device(device_)
@@ -46,9 +79,23 @@
 		return;
 	}
 
-	currentPacket.data[0]   = (uint8_t *)bytes;
-	currentPacket.frames    = (uint32_t)audioPacket->GetSampleFrameCount();
-	currentPacket.timestamp = timestamp;
+	const uint32_t frameCount = (uint32_t)audioPacket->GetSampleFrameCount();
+	currentPacket.frames      = frameCount;
+	currentPacket.timestamp   = timestamp;
+
+	if (!ISSTEREO(channelFormat)) {
+		if (audioRepacker->repack((uint8_t *)bytes, frameCount) < 0) {
+			LOG(LOG_ERROR, "Failed to convert audio packet data");
+			return;
+		}
+
+		currentPacket.data[0]   = (*audioRepacker)->packet_buffer;
+	} else {
+		currentPacket.data[0]   = (uint8_t *)bytes;
+	}
+
+	nextAudioTS = timestamp +
+		((uint64_t)frameCount * 1000000000ULL / 48000ULL) + 1;
 
 	obs_source_output_audio(decklink->GetSource(), &currentPacket);
 }
@@ -78,6 +125,19 @@
 	obs_source_output_video(decklink->GetSource(), &currentFrame);
 }
 
+void DeckLinkDeviceInstance::FinalizeStream()
+{
+	input->SetCallback(nullptr);
+
+	if (audioRepacker != nullptr)
+	{
+		delete audioRepacker;
+		audioRepacker = nullptr;
+	}
+
+	mode = nullptr;
+}
+
 bool DeckLinkDeviceInstance::StartCapture(DeckLinkDeviceMode *mode_)
 {
 	if (mode != nullptr)
@@ -93,8 +153,6 @@
 	pixelFormat = decklink->GetPixelFormat();
 	currentFrame.format = ConvertPixelFormat(pixelFormat);
 
-	input->SetCallback(this);
-
 	const BMDDisplayMode displayMode = mode_->GetDisplayMode();
 
 	const HRESULT videoResult = input->EnableVideoInput(displayMode,
@@ -102,22 +160,36 @@
 
 	if (videoResult != S_OK) {
 		LOG(LOG_ERROR, "Failed to enable video input");
-		input->SetCallback(nullptr);
 		return false;
 	}
 
-	const HRESULT audioResult = input->EnableAudioInput(
-			bmdAudioSampleRate48kHz, bmdAudioSampleType16bitInteger,
-			2);
+	channelFormat = decklink->GetChannelFormat();
+	currentPacket.speakers = channelFormat;
+
+	if (channelFormat != SPEAKERS_UNKNOWN) {
+		const int channel = ConvertChannelFormat(channelFormat);
+		const HRESULT audioResult = input->EnableAudioInput(
+				bmdAudioSampleRate48kHz, bmdAudioSampleType16bitInteger,
+				channel);
 
-	if (audioResult != S_OK)
-		LOG(LOG_WARNING, "Failed to enable audio input; continuing...");
+		if (audioResult != S_OK)
+			LOG(LOG_WARNING, "Failed to enable audio input; continuing...");
+
+		if (!ISSTEREO(channelFormat)) {
+			const audio_repack_mode_t repack_mode = ConvertRepackFormat(channelFormat);
+			audioRepacker = new AudioRepacker(repack_mode);
+		}
+	}
+
+	if (input->SetCallback(this) != S_OK) {
+		LOG(LOG_ERROR, "Failed to set callback");
+		FinalizeStream();
+		return false;
+	}
 
 	if (input->StartStreams() != S_OK) {
 		LOG(LOG_ERROR, "Failed to start streams");
-		input->SetCallback(nullptr);
-		input->DisableVideoInput();
-		input->DisableAudioInput();
+		FinalizeStream();
 		return false;
 	}
 
@@ -135,11 +207,7 @@
 			GetDevice()->GetDisplayName().c_str());
 
 	input->StopStreams();
-	input->SetCallback(nullptr);
-	input->DisableVideoInput();
-	input->DisableAudioInput();
-
-	mode = nullptr;
+	FinalizeStream();
 
 	return true;
 }
@@ -154,10 +222,27 @@
 	BMDTimeValue videoDur = 0;
 	BMDTimeValue audioTS = 0;
 
-	if (videoFrame)
+	if (videoFrame) {
 		videoFrame->GetStreamTime(&videoTS, &videoDur, TIME_BASE);
-	if (audioPacket)
-		audioPacket->GetPacketTime(&audioTS, TIME_BASE);
+		lastVideoTS = (uint64_t)videoTS;
+	}
+	if (audioPacket) {
+		BMDTimeValue newAudioTS = 0;
+		int64_t diff;
+
+		audioPacket->GetPacketTime(&newAudioTS, TIME_BASE);
+		audioTS = newAudioTS + audioOffset;
+
+		diff = (int64_t)audioTS - (int64_t)nextAudioTS;
+		if (diff > 10000000LL) {
+			audioOffset -= diff;
+			audioTS = newAudioTS + audioOffset;
+
+		} else if (diff < -1000000) {
+			audioOffset = 0;
+			audioTS = newAudioTS;
+		}
+	}
 
 	if (videoFrame && videoTS >= 0)
 		HandleVideoFrame(videoFrame, (uint64_t)videoTS);

obs-studio-18.0.1.tar.xz/plugins/decklink/decklink-device-instance.hpp -> obs-studio-18.0.2.tar.xz/plugins/decklink/decklink-device-instance.hpp Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/decklink-device.cpp -> obs-studio-18.0.2.tar.xz/plugins/decklink/decklink-device.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/decklink-device.hpp -> obs-studio-18.0.2.tar.xz/plugins/decklink/decklink-device.hpp Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/decklink.cpp -> obs-studio-18.0.2.tar.xz/plugins/decklink/decklink.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/decklink.hpp -> obs-studio-18.0.2.tar.xz/plugins/decklink/decklink.hpp Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/linux/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/plugins/decklink/linux/CMakeLists.txt Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/mac/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/plugins/decklink/mac/CMakeLists.txt Changed

obs-studio-18.0.1.tar.xz/plugins/decklink/plugin-main.cpp -> obs-studio-18.0.2.tar.xz/plugins/decklink/plugin-main.cpp Changed

@@ -7,6 +7,25 @@
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("decklink", "en-US")
 
+#define DEVICE_HASH     "device_hash"
+#define DEVICE_NAME     "device_name"
+#define MODE_ID         "mode_id"
+#define MODE_NAME       "mode_name"
+#define CHANNEL_FORMAT  "channel_format"
+#define PIXEL_FORMAT    "pixel_format"
+#define BUFFERING       "buffering"
+
+#define TEXT_DEVICE                     obs_module_text("Device")
+#define TEXT_MODE                       obs_module_text("Mode")
+#define TEXT_PIXEL_FORMAT               obs_module_text("PixelFormat")
+#define TEXT_CHANNEL_FORMAT             obs_module_text("ChannelFormat")
+#define TEXT_CHANNEL_FORMAT_NONE        obs_module_text("ChannelFormat.None")
+#define TEXT_CHANNEL_FORMAT_2_0CH       obs_module_text("ChannelFormat.2_0ch")
+#define TEXT_CHANNEL_FORMAT_5_1CH       obs_module_text("ChannelFormat.5_1ch")
+#define TEXT_CHANNEL_FORMAT_5_1CH_BACK  obs_module_text("ChannelFormat.5_1chBack")
+#define TEXT_CHANNEL_FORMAT_7_1CH       obs_module_text("ChannelFormat.7_1ch")
+#define TEXT_BUFFERING                  obs_module_text("Buffering")
+
 static DeckLinkDeviceDiscovery *deviceEnum = nullptr;
 
 static void decklink_enable_buffering(DeckLink *decklink, bool enabled)
@@ -25,7 +44,7 @@
 	DeckLink *decklink = new DeckLink(source, deviceEnum);
 
 	decklink_enable_buffering(decklink,
-			obs_data_get_bool(settings, "buffering"));
+			obs_data_get_bool(settings, BUFFERING));
 
 	obs_source_update(source, settings);
 	return decklink;
@@ -40,25 +59,29 @@
 static void decklink_update(void *data, obs_data_t *settings)
 {
 	DeckLink *decklink = (DeckLink *)data;
-	const char *hash = obs_data_get_string(settings, "device_hash");
-	long long id = obs_data_get_int(settings, "mode_id");
-	BMDPixelFormat format = (BMDPixelFormat)obs_data_get_int(settings,
-			"pixel_format");
+	const char *hash = obs_data_get_string(settings, DEVICE_HASH);
+	long long id = obs_data_get_int(settings, MODE_ID);
+	BMDPixelFormat pixelFormat = (BMDPixelFormat)obs_data_get_int(settings,
+			PIXEL_FORMAT);
+	speaker_layout channelFormat = (speaker_layout)obs_data_get_int(settings,
+			CHANNEL_FORMAT);
 
 	decklink_enable_buffering(decklink,
-			obs_data_get_bool(settings, "buffering"));
+			obs_data_get_bool(settings, BUFFERING));
 
 	ComPtr<DeckLinkDevice> device;
 	device.Set(deviceEnum->FindByHash(hash));
 
-	decklink->SetPixelFormat(format);
+	decklink->SetPixelFormat(pixelFormat);
+	decklink->SetChannelFormat(channelFormat);
 	decklink->Activate(device, id);
 }
 
 static void decklink_get_defaults(obs_data_t *settings)
 {
-	obs_data_set_default_bool(settings, "buffering", true);
-	obs_data_set_default_int(settings, "pixel_format", bmdFormat8BitYUV);
+	obs_data_set_default_bool(settings, BUFFERING, true);
+	obs_data_set_default_int(settings, PIXEL_FORMAT, bmdFormat8BitYUV);
+	obs_data_set_default_int(settings, CHANNEL_FORMAT, SPEAKERS_STEREO);
 }
 
 static const char *decklink_get_name(void*)
@@ -69,10 +92,10 @@
 static bool decklink_device_changed(obs_properties_t *props,
 		obs_property_t *list, obs_data_t *settings)
 {
-	const char *name = obs_data_get_string(settings, "device_name");
-	const char *hash = obs_data_get_string(settings, "device_hash");
-	const char *mode = obs_data_get_string(settings, "mode_name");
-	long long modeId = obs_data_get_int(settings, "mode_id");
+	const char *name = obs_data_get_string(settings, DEVICE_NAME);
+	const char *hash = obs_data_get_string(settings, DEVICE_HASH);
+	const char *mode = obs_data_get_string(settings, MODE_NAME);
+	long long modeId = obs_data_get_int(settings, MODE_ID);
 
 	size_t itemCount = obs_property_list_item_count(list);
 	bool itemFound = false;
@@ -90,25 +113,41 @@
 		obs_property_list_item_disable(list, 0, true);
 	}
 
-	list = obs_properties_get(props, "mode_id");
+	obs_property_t *modeList = obs_properties_get(props, MODE_ID);
+	obs_property_t *channelList = obs_properties_get(props, CHANNEL_FORMAT);
+
+	obs_property_list_clear(modeList);
 
-	obs_property_list_clear(list);
+	obs_property_list_clear(channelList);
+	obs_property_list_add_int(channelList, TEXT_CHANNEL_FORMAT_NONE,
+			SPEAKERS_UNKNOWN);
+	obs_property_list_add_int(channelList, TEXT_CHANNEL_FORMAT_2_0CH,
+			SPEAKERS_STEREO);
 
 	ComPtr<DeckLinkDevice> device;
 	device.Set(deviceEnum->FindByHash(hash));
 
 	if (!device) {
-		obs_property_list_add_int(list, mode, modeId);
-		obs_property_list_item_disable(list, 0, true);
+		obs_property_list_add_int(modeList, mode, modeId);
+		obs_property_list_item_disable(modeList, 0, true);
 	} else {
 		const std::vector<DeckLinkDeviceMode*> &modes =
 			device->GetModes();
 
 		for (DeckLinkDeviceMode *mode : modes) {
-			obs_property_list_add_int(list,
+			obs_property_list_add_int(modeList,
 					mode->GetName().c_str(),
 					mode->GetId());
 		}
+
+		if (device->GetMaxChannel() >= 8) {
+			obs_property_list_add_int(channelList, TEXT_CHANNEL_FORMAT_5_1CH,
+					SPEAKERS_5POINT1);
+			obs_property_list_add_int(channelList, TEXT_CHANNEL_FORMAT_5_1CH_BACK,
+					SPEAKERS_5POINT1_SURROUND);
+			obs_property_list_add_int(channelList, TEXT_CHANNEL_FORMAT_7_1CH,
+					SPEAKERS_7POINT1);
+		}
 	}
 
 	return true;
@@ -132,26 +171,30 @@
 {
 	obs_properties_t *props = obs_properties_create();
 
-	obs_property_t *list = obs_properties_add_list(props, "device_hash",
-			obs_module_text("Device"), OBS_COMBO_TYPE_LIST,
-			OBS_COMBO_FORMAT_STRING);
+	obs_property_t *list = obs_properties_add_list(props, DEVICE_HASH,
+			TEXT_DEVICE, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
 	obs_property_set_modified_callback(list, decklink_device_changed);
 
 	fill_out_devices(list);
 
-	list = obs_properties_add_list(props, "mode_id",
-			obs_module_text("Mode"), OBS_COMBO_TYPE_LIST,
-			OBS_COMBO_FORMAT_INT);
+	list = obs_properties_add_list(props, MODE_ID, TEXT_MODE,
+			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 
-	list = obs_properties_add_list(props, "pixel_format",
-			obs_module_text("PixelFormat"), OBS_COMBO_TYPE_LIST,
+	list = obs_properties_add_list(props, PIXEL_FORMAT,
+			TEXT_PIXEL_FORMAT, OBS_COMBO_TYPE_LIST,
 			OBS_COMBO_FORMAT_INT);
-
 	obs_property_list_add_int(list, "8-bit YUV", bmdFormat8BitYUV);
 	obs_property_list_add_int(list, "8-bit BGRA", bmdFormat8BitBGRA);
 
-	obs_properties_add_bool(props, "buffering",
-			obs_module_text("Buffering"));
+	list = obs_properties_add_list(props, CHANNEL_FORMAT,
+			TEXT_CHANNEL_FORMAT, OBS_COMBO_TYPE_LIST,
+			OBS_COMBO_FORMAT_INT);
+	obs_property_list_add_int(list, TEXT_CHANNEL_FORMAT_NONE,
+			SPEAKERS_UNKNOWN);
+	obs_property_list_add_int(list, TEXT_CHANNEL_FORMAT_2_0CH,
+			SPEAKERS_STEREO);
+
+	obs_properties_add_bool(props, BUFFERING, TEXT_BUFFERING);
 
 	UNUSED_PARAMETER(data);
 	return props;

obs-studio-18.0.1.tar.xz/plugins/decklink/win/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/plugins/decklink/win/CMakeLists.txt Changed

obs-studio-18.0.1.tar.xz/plugins/enc-amf/#Resources/Installer.in.iss -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/#Resources/Installer.in.iss Changed

obs-studio-18.0.1.tar.xz/plugins/enc-amf/#Resources/PATCH_NOTES.md -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/#Resources/PATCH_NOTES.md Changed

@@ -1,18 +1,32 @@
-# 1.4.3.8 - Settings Transfer, Automatic VBV Buffer adjustment and Fixes (Hotfix 2)
-Another day, another new feature: this time it is transferring settings between versions, so that you will no longer use settings when a change to a setting is made. Since it only just now started tracking the config version, it will only work with settings created between 1.4.3.0 and 1.4.3.5, any other version might end up with broken settings.
+# 2.0.0.0 - The 'Ashes of the Phoenix' Update
+The plugin rises from the no-update-phase back to bring you an even better experience with High Efficiency Video Coding (HEVC) encoding, Variance Based Adaptive Quantitization (VBAQ), Pre-Pass support and Asynchronous Queue mode.
 
-Another change has been done to the Automatic VBV Buffer Size, which will now behave much more predictable. A value of 0% is completely unrestricted, 50% matches the calculated bitrate and 100% matches the calculated strict bitrate.
+High Efficiency Video Coding (H265/HEVC) is available on the Polaris architecture and offers massively better quality for the same bitrate, essentially resulting in lower bitrates looking much better. This means that at 1000 kbit H265/HEVC you can get close or surpass the quality of 2500 kbit H264/AVC in many types of scenes and motion. Unfortunately it never took off as it only got slightly better quality than VP9 and AV1 is already beating it in terms of speed and quality.
 
-Presets will also now use the proper minimum and maximum QP values and the minimum QP default value has been increased to 11.
+Variance Based Adaptive Quantitization (VBAQ) and Pre-Pass are both methods to better distribute the Bitrate in a given frame. VBAQ works on the principle of visual perception, while Pre-Pass looks at which areas need more Bitrate to not end up being blocky. Enabling both will result in a much better output with no change in Bitrate.
 
-Hotfix 1: Fix enumeration based properties not working correctly due to a programming error.
-Hotfix 2: Actually fix the enumeration based properties for real this time.
+Asynchronous Queue is a new feature that used to be the standard behaviour in earlier versions. Since no two CPUs are the same, Asynchronous Queue offers a way to use multiple cores of the CPU for the encoding task, instead of just handling everything on a single core. This feature is in very early stages, so it will probably cause issues unless absolutely needed.
 
 ## Changelog
-* Added: Version-specific setting transfer code which should reduce the lost settings between updates.
-* Changed: VBV Buffer Strictness is now linear with three steps: 100000 (0%), Target Bitrate (50%) and Strict Target Bitrate (100%).
-* Changed: Default for Minimum QP is now 11.
-* Fixed: Presets not using the proper QP Minimum and Maximum.
-* Fixed: Startup log messages not showing proper error codes.
-* Hotfix: Fix enumeration based properties not using the correct values.
-* Hotfix: Fix the default value for B-Frame Pattern being '-1' due to an oversight in code.
\ No newline at end of file
+* Redesigned the internal structure to be much faster for much less CPU usage.
+* Fixed several object lifetime issues that were only visible while debugging.
+* Massively improved capability testing which now allows us to see the exact limits of the encoder.
+* Fixed a crash-to-desktop on closing OBS.
+* Added H264/AVC and H265/HEVC encoders.
+* Slightly redesigned the UI to further improve quality of life.
+* Removed 'OpenGL' and 'Host' entries from the Video API field as they aren't actual APIs. (#216)
+* Removed the useless 'Usage' field, which was causing a lot of PEBKAC issues. (#210)
+* Added the ability to use Keyframe Interval in 'Master' View Mode.
+* Updated preset 'High Quality' to use a QP value of 18/18/18.
+* Updated preset 'Indistinguishable' to use a QP value of 15/15/15.
+* Fixed a crash with 'Automatic' VBV Buffer while using 'Constant QP'.
+* Fixed 'Filler Data' and 'Enforce HRD' not working properly at all times. (#215)
+* Changed the behaviour of 'Automatic' VBV Buffer to be linear with 'Constant QP'.
+* Massively improved output timestamps.
+* Fired Steve.
+* Fixed a rare crash that could happen with certain translations.
+* Changed the default for 'VBAQ' to 'Enabled' for H264 and H265.
+* Added an Asynchronous Queue mode which enables safe multi-threading for slightly higher CPU usage and encoding latency. (#211)
+* Split the 'OpenCL' field into 'OpenCL Transfer' (Use OpenCL to send the frame to the GPU?) and 'OpenCL Conversion' (Use OpenCL instead of DirectCompute for frame conversion?). (#212, #214)
+* Fixed certain presets permanently locking the Keyframe Interval and IDR Period to low numbers. (#213)
+* Improved Performance Tracking which is visible when starting OBS with --verbose --log_unfiltered.

obs-studio-18.0.1.tar.xz/plugins/enc-amf/#Resources/package.in.bat -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/#Resources/package.in.bat Changed

obs-studio-18.0.2.tar.xz/plugins/enc-amf/.gitattributes Added

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

obs-studio-18.0.2.tar.xz/plugins/enc-amf/.mailmap Added

obs-studio-18.0.2.tar.xz/plugins/enc-amf/AUTHORS Added

obs-studio-18.0.1.tar.xz/plugins/enc-amf/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/CMakeLists.txt Changed

@@ -1,31 +1,48 @@
 cmake_minimum_required(VERSION 2.8.12)
-
-# Shared (OBS Studio & Standalone)
 PROJECT(enc-amf)
+
+################################################################################
+# Version
+################################################################################
+SET(enc-amf_VERSION_MAJOR 2)
+SET(enc-amf_VERSION_MINOR 1)
+SET(enc-amf_VERSION_PATCH 0)
+configure_file(
+	"${PROJECT_SOURCE_DIR}/#Resources/package.in.bat"
+	"${PROJECT_SOURCE_DIR}/#Resources/package.bat"
+)
+configure_file(
+	"${PROJECT_SOURCE_DIR}/#Resources/Installer.in.iss"
+	"${PROJECT_SOURCE_DIR}/#Resources/Installer.iss"
+)
+configure_file(
+	"${PROJECT_SOURCE_DIR}/Include/Version.h.in"
+	"${PROJECT_BINARY_DIR}/Include/Version.h"
+)
+
+################################################################################
+# Code
+################################################################################
 SET(enc-amf_HEADERS
 	"Include/amf.h"
 	"Include/amf-capabilities.h"
-	"Include/amf-h264.h"
+	"Include/amf-encoder.h"
 	"Include/api-base.h"
-	"Include/api-d3d9.h"
-	"Include/api-d3d11.h"
 	"Include/api-host.h"
 	"Include/api-opengl.h"
-	"Include/enc-h264.h"
+	"Include/utility.h"
 	"Include/plugin.h"
+	"Include/strings.h"
 	"${PROJECT_BINARY_DIR}/Include/Version.h"
 )
 SET(enc-amf_SOURCES
 	"Source/amf.cpp"
 	"Source/amf-capabilities.cpp"
-	"Source/amf-h264.cpp"
+	"Source/amf-encoder.cpp"
 	"Source/api-base.cpp"
 	"Source/api-host.cpp"
-	"Source/api-d3d9.cpp"
-	"Source/api-d3d11.cpp"
 	"Source/api-opengl.cpp"
-	"Source/enc-h264.cpp"
-	"Source/misc-util.cpp"
+	"Source/utility.cpp"
 	"Source/plugin.cpp"
 )
 SET(enc-amf_LIBRARIES
@@ -33,29 +50,29 @@
 	winmm
 )
 
-# Version
-SET(enc-amf_VERSION_MAJOR 1)
-SET(enc-amf_VERSION_MINOR 4)
-SET(enc-amf_VERSION_PATCH 3)
-SET(enc-amf_VERSION_BUILD 11)
-configure_file(
-	"${PROJECT_SOURCE_DIR}/#Resources/package.in.bat"
-	"${PROJECT_SOURCE_DIR}/#Resources/package.bat"
-)
-configure_file(
-	"${PROJECT_SOURCE_DIR}/#Resources/Installer.in.iss"
-	"${PROJECT_SOURCE_DIR}/#Resources/Installer.iss"
-)
-configure_file(
-	"${PROJECT_SOURCE_DIR}/Include/Version.h.in"
-	"${PROJECT_BINARY_DIR}/Include/Version.h"
-)
+# Windows Only
+if (WIN32)
+	LIST(APPEND enc-amf_HEADERS
+		"Include/api-d3d9.h"
+		"Include/api-d3d11.h"
+	)
+	LIST(APPEND enc-amf_SOURCES
+		"Source/api-d3d9.cpp"
+		"Source/api-d3d11.cpp"
+	)
+endif()
 
-# OBS Studio Specific
+################################################################################
+# Standalone and OBS Studio Build Data
+################################################################################
 if(BUILD_AMF_ENCODER)
+	# OBS Studio Specific
+	
+	# Variables
 	OPTION(AMDAMF_Disable "Disable AMD Advanced Media Framework support" OFF)
 	SET(AMDAMF_SDKDir "" CACHE PATH "AMD Advanced Media Framework SDK Directory")
 
+	# Tests
 	if(AMDAMF_Disable)
 		message(STATUS "AMD AMF support disabled")
 		return()
@@ -71,6 +88,7 @@
 		return()
 	endif()
 	
+	# Directories
 	INCLUDE_DIRECTORIES(
 		"${CMAKE_SOURCE_DIR}"
 		"${PROJECT_BINARY_DIR}"
@@ -83,13 +101,13 @@
 	)
 	SET(LIBOBS_LIBRARIES libobs)
 else()
-# Standlone Specific
+	# Standlone Specific
 
 	# Variables
 	SET(PATH_AMDAMFSDK "" CACHE PATH "AMD Advanced Media Framework SDK Directory")
 	SET(PATH_OBSStudio "" CACHE PATH "OBS Studio Source Code Directory")
-	#SET(PATH_libobs "" CACHE PATH "Path to obs.lib from OBS Studio")
 	
+	# Tests
 	if(PATH_AMDAMFSDK STREQUAL "")
 		message(STATUS "PATH_AMDAMFSDK not set!")
 		return()
@@ -110,7 +128,7 @@
 		return()
 	endif()
 	
-	# Stuff
+	# Find OBS Libraries
 	SET(obsPath "${PATH_OBSStudio}")
 	INCLUDE("${PATH_OBSStudio}/cmake/external/Findlibobs.cmake")
 	
@@ -125,8 +143,44 @@
 		"${PATH_AMDAMFSDK}/amf/public/include"
 		"${PATH_OBSStudio}/"
 	)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
+################################################################################
+# Optional Features
+################################################################################
+# AVC Encoding
+OPTION(BUILD_AMF_AVC "AMF Plugin: Build AVC (H264) support" ON)
+
+if(BUILD_AMF_AVC)
+	add_definitions(-DWITH_AVC)
+	LIST(APPEND enc-amf_HEADERS
+		"Include/amf-encoder-h264.h"
+		"Include/enc-h264.h"
+	)
+	LIST(APPEND enc-amf_SOURCES
+		"Source/amf-encoder-h264.cpp"
+		"Source/enc-h264.cpp"
+	)
+endif()
+
+# HEVC Encoding
+OPTION(BUILD_AMF_HEVC "AMF Plugin: Build HEVC support" ON)
+if(BUILD_AMF_HEVC)
+	add_definitions(-DWITH_HEVC)
+	LIST(APPEND enc-amf_HEADERS
+		"Include/amf-encoder-h265.h"
+		"Include/enc-h265.h"
+	)
+	LIST(APPEND enc-amf_SOURCES
+		"Source/amf-encoder-h265.cpp"
+		"Source/enc-h265.cpp"
+	)
+endif()
+
+################################################################################
+# Build
+################################################################################
 ADD_LIBRARY(enc-amf MODULE
 	${enc-amf_HEADERS}
 	${enc-amf_SOURCES}
@@ -136,6 +190,19 @@
 	${enc-amf_LIBRARIES}
 )
 
+# All Warnings, Extra Warnings, Pedantic
+if(MSVC)
+  # Force to always compile with W4
+  if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+  endif()
+elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+  # Update if necessary

obs-studio-18.0.1.tar.xz/plugins/enc-amf/CONTRIBUTING.md -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/CONTRIBUTING.md Changed

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/Version.h.in -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/Version.h.in Changed

@@ -1,5 +1,30 @@
+/*
+MIT License
 
-#define PLUGIN_VERSION_MAJOR			@enc-amf_VERSION_MAJOR@
-#define PLUGIN_VERSION_MINOR			@enc-amf_VERSION_MINOR@
-#define PLUGIN_VERSION_PATCH			@enc-amf_VERSION_PATCH@
-#define PLUGIN_VERSION_BUILD			@enc-amf_VERSION_BUILD@
\ No newline at end of file
+Copyright (c) 2016-2017
+
+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
+
+const uint16_t PLUGIN_VERSION_MAJOR	= @enc-amf_VERSION_MAJOR@;
+const uint16_t PLUGIN_VERSION_MINOR	= @enc-amf_VERSION_MINOR@;
+const uint32_t PLUGIN_VERSION_PATCH	= @enc-amf_VERSION_PATCH@;
+const uint64_t PLUGIN_VERSION_FULL = (((uint64_t)(PLUGIN_VERSION_MAJOR & 0xFFFF) << 48ull) | ((uint64_t)(PLUGIN_VERSION_MINOR & 0xFFFF) << 32ull) | ((uint64_t)(PLUGIN_VERSION_PATCH) & 0xFFFFFFFF));

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/amf-capabilities.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/amf-capabilities.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,9 @@
 // Plugin
 #include "plugin.h"
 #include "amf.h"
-#include "amf-h264.h"
+#include "amf-encoder.h"
+#include "amf-encoder-h264.h"
+#include "amf-encoder-h265.h"
 #include "api-base.h"
 
 // AMF
@@ -48,64 +50,31 @@
 
 namespace Plugin {
 	namespace AMD {
-		volatile struct VCEDeviceCapabilities {
-			amf::AMF_ACCELERATION_TYPE acceleration_type;
-			uint32_t maxProfile;
-			uint32_t maxProfileLevel;
-			uint32_t maxBitrate;
-			uint32_t minReferenceFrames;
-			uint32_t maxReferenceFrames;
-			bool supportsBFrames;
-			bool supportsFixedSliceMode;
-			uint32_t maxTemporalLayers;
-			uint32_t maxNumOfStreams;
-			uint32_t maxNumOfHwInstances;
-
-			struct IOCaps {
-				int32_t minWidth, maxWidth;
-				int32_t minHeight, maxHeight;
-				bool supportsInterlaced;
-				uint32_t verticalAlignment;
-
-				std::vector<std::pair<amf::AMF_SURFACE_FORMAT, bool>> formats;
-				std::vector<std::pair<amf::AMF_MEMORY_TYPE, bool>> memoryTypes;
-			} input, output;
-
-			Plugin::AMD::VCEDeviceCapabilities::VCEDeviceCapabilities();
-		};
-
-		class VCECapabilities {
-			//////////////////////////////////////////////////////////////////////////
-			// Singleton
-			//////////////////////////////////////////////////////////////////////////
+		class CapabilityManager {
+			#pragma region Singleton
 			public:
-			static std::shared_ptr<Plugin::AMD::VCECapabilities> GetInstance();
-			static void ReportCapabilities(std::shared_ptr<Plugin::API::Base> api);
-			static void ReportAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api,
-				Plugin::API::Adapter adapter);
-			static void ReportAdapterTypeCapabilities(std::shared_ptr<Plugin::API::Base> api,
-				Plugin::API::Adapter adapter,
-				H264EncoderType type);
-			static void ReportAdapterTypeIOCapabilities(std::shared_ptr<Plugin::API::Base> api,
-				Plugin::API::Adapter adapter,
-				H264EncoderType type,
-				bool output);
-
-			//////////////////////////////////////////////////////////////////////////
-			// Class
-			//////////////////////////////////////////////////////////////////////////
-			public:
-			VCECapabilities();
-			~VCECapabilities();
-
-			bool Refresh();
-			std::vector<std::pair<H264EncoderType, VCEDeviceCapabilities>>
-				GetAllAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter);
-			VCEDeviceCapabilities
-				GetAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, H264EncoderType type);
+			static void Initialize();
+			static CapabilityManager* Instance();
+			static void Finalize();
+
+			private: // Private Initializer & Finalizer
+			CapabilityManager();
+			~CapabilityManager();
+
+			public: // Remove all Copy operators
+			CapabilityManager(CapabilityManager const&) = delete;
+			void operator=(CapabilityManager const&) = delete;
+			#pragma endregion Singleton
+			
+			bool IsCodecSupported(AMD::Codec codec);
+			bool IsCodecSupportedByAPI(AMD::Codec codec, API::Type api);
+			bool IsCodecSupportedByAPIAdapter(AMD::Codec codec, API::Type api, API::Adapter adapter);
 
 			private:
-			std::map<std::tuple<std::string, Plugin::API::Adapter, Plugin::AMD::H264EncoderType>, VCEDeviceCapabilities> capabilityMap;
+			std::map<
+				std::tuple<API::Type, API::Adapter, AMD::Codec>,
+				bool> m_CapabilityMap;
+
 		};
 	}
 }
\ No newline at end of file

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/amf-encoder-h264.h Added

@@ -0,0 +1,220 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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
+
+#include "plugin.h"
+#include "amf-encoder.h"
+#include "components/VideoEncoderVCE.h"
+
+namespace Plugin {
+	namespace AMD {
+		namespace H264 {
+			enum class SliceMode : uint8_t {
+				Row = 1, // Horizontal?
+				Column = 2, // Vertical?
+			};
+		}
+
+		class EncoderH264 : public Encoder {
+			public:
+			EncoderH264(
+				std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter = API::Adapter::Adapter(),
+				bool useOpenCLSubmission = false, bool useOpenCLConversion = false,
+				ColorFormat colorFormat = ColorFormat::NV12, ColorSpace colorSpace = ColorSpace::BT709, bool fullRangeColor = false,
+				bool useAsyncQueue = false, size_t asyncQueueSize = 0);
+			virtual ~EncoderH264();
+
+			// Properties - Initialization
+			virtual std::vector<Usage> CapsUsage() override;
+			virtual void SetUsage(Usage v) override;
+			virtual Usage GetUsage() override;
+
+			// Properties - Static
+			virtual std::vector<QualityPreset> CapsQualityPreset() override;
+			virtual void SetQualityPreset(QualityPreset v) override;
+			virtual QualityPreset GetQualityPreset() override;
+
+			virtual std::vector<Profile> CapsProfile() override;
+			virtual void SetProfile(Profile v) override;
+			virtual Profile GetProfile() override;
+
+			virtual std::vector<ProfileLevel> CapsProfileLevel() override;
+			virtual void SetProfileLevel(ProfileLevel v) override;
+			virtual ProfileLevel GetProfileLevel() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames() override;
+			virtual void SetMaximumReferenceFrames(uint64_t v) override;
+			virtual uint64_t GetMaximumReferenceFrames() override;
+
+			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() override;
+			virtual void SetResolution(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetResolution() override;
+
+			virtual void SetAspectRatio(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetAspectRatio() override;
+
+			virtual void SetFrameRate(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetFrameRate() override;
+
+			virtual std::vector<CodingType> CapsCodingType() override;
+			virtual void SetCodingType(CodingType v) override;
+			virtual CodingType GetCodingType() override;
+
+			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames() override;
+			virtual void SetMaximumLongTermReferenceFrames(uint32_t v) override;
+			virtual uint32_t GetMaximumLongTermReferenceFrames() override;
+
+			// Properties - Dynamic
+			virtual std::vector<RateControlMethod> CapsRateControlMethod() override;
+			virtual void SetRateControlMethod(RateControlMethod v) override;
+			virtual RateControlMethod GetRateControlMethod() override;
+
+			virtual std::vector<PrePassMode> CapsPrePassMode() override;
+			virtual void SetPrePassMode(PrePassMode v) override;
+			virtual PrePassMode GetPrePassMode() override;
+
+			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) override;
+			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled() override;
+
+			virtual void SetFrameSkippingEnabled(bool v) override;
+			virtual bool IsFrameSkippingEnabled() override;
+
+			virtual void SetEnforceHRDEnabled(bool v) override;
+			virtual bool IsEnforceHRDEnabled() override;
+
+			virtual void SetFillerDataEnabled(bool v) override;
+			virtual bool IsFillerDataEnabled() override;
+
+			void SetQPMinimum(uint8_t v);
+			uint8_t GetQPMinimum();
+
+			void SetQPMaximum(uint8_t v);
+			uint8_t GetQPMaximum();
+
+			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate() override;
+			virtual void SetTargetBitrate(uint64_t v) override;
+			virtual uint64_t GetTargetBitrate() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate() override;
+			virtual void SetPeakBitrate(uint64_t v) override;
+			virtual uint64_t GetPeakBitrate() override;
+
+			virtual void SetIFrameQP(uint8_t v) override;
+			virtual uint8_t GetIFrameQP() override;
+
+			virtual void SetPFrameQP(uint8_t v) override;
+			virtual uint8_t GetPFrameQP() override;
+
+			virtual void SetBFrameQP(uint8_t v);
+			virtual uint8_t GetBFrameQP();
+
+			virtual void SetMaximumAccessUnitSize(uint32_t v) override;
+			virtual uint32_t GetMaximumAccessUnitSize() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize() override;
+			virtual void SetVBVBufferSize(uint64_t v) override;
+			virtual uint64_t GetVBVBufferSize() override;
+
+			virtual void SetVBVBufferInitialFullness(double v) override;
+			virtual float GetInitialVBVBufferFullness() override;
+
+			// Properties - Picture Control
+			virtual void SetIDRPeriod(uint32_t v) override;
+			virtual uint32_t GetIDRPeriod() override;
+
+			void SetHeaderInsertionSpacing(uint32_t v);
+			uint32_t GetHeaderInsertionSpacing();
+
+			virtual void SetGOPAlignmentEnabled(bool v) override;
+			virtual bool IsGOPAlignmentEnabled() override;
+
+			virtual void SetDeblockingFilterEnabled(bool v) override;
+			virtual bool IsDeblockingFilterEnabled() override;
+
+			virtual uint8_t CapsBFramePattern();
+			virtual void SetBFramePattern(uint8_t v);
+			virtual uint8_t GetBFramePattern();
+
+			virtual void SetBFrameDeltaQP(int8_t v);
+			virtual int8_t GetBFrameDeltaQP();
+
+			virtual void SetBFrameReferenceEnabled(bool v);
+			virtual bool IsBFrameReferenceEnabled();
+
+			virtual void SetBFrameReferenceDeltaQP(int8_t v);
+			virtual int8_t GetBFrameReferenceDeltaQP();
+
+			// Properties - Motion Estimation
+			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationQuarterPixelEnabled() override;
+
+			virtual void SetMotionEstimationHalfPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationHalfPixelEnabled() override;
+
+			// Properties - Intra-Refresh
+			std::pair<uint32_t, uint32_t> CapsIntraRefreshNumMBsPerSlot();
+			void SetIntraRefreshNumMBsPerSlot(uint32_t v);
+			uint32_t GetIntraRefreshNumMBsPerSlot();
+
+			void SetIntraRefreshNumOfStripes(uint32_t v);
+			uint32_t GetIntraRefreshNumOfStripes();
+
+			// Properties - Slicing
+			void SetSliceMode(H264::SliceMode v);
+			H264::SliceMode GetSliceMode();
+
+			virtual std::pair<uint32_t, uint32_t> CapsSlicesPerFrame() override;
+			virtual void SetSlicesPerFrame(uint32_t v) override;
+			virtual uint32_t GetSlicesPerFrame() override;
+
+			virtual void SetSliceControlMode(SliceControlMode v) override;
+			virtual SliceControlMode GetSliceControlMode() override;
+
+			virtual std::pair<uint32_t, uint32_t> CapsSliceControlSize() override;
+			virtual void SetSliceControlSize(uint32_t v) override;
+			virtual uint32_t GetSliceControlSize() override;
+
+			std::pair<uint32_t, uint32_t> CapsMaximumSliceSize();

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/amf-encoder-h265.h Added

@@ -0,0 +1,248 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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
+
+#include "plugin.h"
+#include "amf-encoder.h"
+#include "components/VideoEncoderHEVC.h"
+
+namespace Plugin {
+	namespace AMD {
+		namespace H265 {
+			enum class Tier : uint8_t {
+				Main,
+				High,
+			};
+			enum class GOPType : uint8_t {
+				Fixed,		// Fixed Interval GOP
+				Variable,	// Variable Interval GOP
+			};
+			enum class HeaderInsertionMode : uint8_t {
+				None = 0,
+				AlignedToGOP = 1,
+				AlignedToIDR = 2,
+			};
+		}
+
+		class EncoderH265 : public Encoder {
+			public:
+			EncoderH265(
+				std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter = API::Adapter::Adapter(),
+				bool useOpenCLSubmission = false, bool useOpenCLConversion = false,
+				ColorFormat colorFormat = ColorFormat::NV12, ColorSpace colorSpace = ColorSpace::BT709, bool fullRangeColor = false,
+				bool useAsyncQueue = false, size_t asyncQueueSize = 0);
+			virtual ~EncoderH265();
+
+			// Initialization
+			virtual std::vector<Usage> CapsUsage() override;
+			virtual void SetUsage(Usage v) override;
+			virtual Usage GetUsage() override;
+
+			// Static
+			virtual std::vector<QualityPreset> CapsQualityPreset() override;
+			virtual void SetQualityPreset(QualityPreset v) override;
+			virtual QualityPreset GetQualityPreset() override;
+
+			virtual std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> CapsResolution() override;
+			virtual void SetResolution(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetResolution() override;
+
+			virtual void SetAspectRatio(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetAspectRatio() override;
+
+			virtual void SetFrameRate(std::pair<uint32_t, uint32_t> v) override;
+			virtual std::pair<uint32_t, uint32_t> GetFrameRate() override;
+
+			virtual std::vector<Profile> CapsProfile() override;
+			virtual void SetProfile(Profile v) override;
+			virtual Profile GetProfile() override;
+
+			virtual std::vector<ProfileLevel> CapsProfileLevel() override;
+			virtual void SetProfileLevel(ProfileLevel v) override;
+			virtual ProfileLevel GetProfileLevel() override;
+
+			std::vector<H265::Tier> CapsTier();
+			void SetTier(H265::Tier v);
+			H265::Tier GetTier();
+
+			virtual std::pair<uint64_t, uint64_t> CapsMaximumReferenceFrames() override;
+			virtual void SetMaximumReferenceFrames(uint64_t v) override;
+			virtual uint64_t GetMaximumReferenceFrames() override;
+
+			virtual std::vector<CodingType> CapsCodingType() override;
+			virtual void SetCodingType(CodingType v) override;
+			virtual CodingType GetCodingType() override;
+
+			virtual std::pair<uint32_t, uint32_t> CapsMaximumLongTermReferenceFrames() override;
+			virtual void SetMaximumLongTermReferenceFrames(uint32_t v) override;
+			virtual uint32_t GetMaximumLongTermReferenceFrames() override;
+
+			/// Rate Control
+			virtual std::vector<RateControlMethod> CapsRateControlMethod() override;
+			virtual void SetRateControlMethod(RateControlMethod v) override;
+			virtual RateControlMethod GetRateControlMethod() override;
+
+			virtual std::vector<PrePassMode> CapsPrePassMode() override;
+			virtual void SetPrePassMode(PrePassMode v) override;
+			virtual PrePassMode GetPrePassMode() override;
+
+			virtual void SetVarianceBasedAdaptiveQuantizationEnabled(bool v) override;
+			virtual bool IsVarianceBasedAdaptiveQuantizationEnabled() override;
+
+			/// VBV Buffer
+			virtual std::pair<uint64_t, uint64_t> CapsVBVBufferSize() override;
+			virtual void SetVBVBufferSize(uint64_t v) override;
+			virtual uint64_t GetVBVBufferSize() override;
+
+			virtual void SetVBVBufferInitialFullness(double v) override;
+			virtual float GetInitialVBVBufferFullness() override;
+
+			/// Picture Control
+			std::vector<H265::GOPType> CapsGOPType();
+			void SetGOPType(H265::GOPType v);
+			H265::GOPType GetGOPType();
+
+			void SetGOPSize(uint32_t v);
+			uint32_t GetGOPSize();
+
+			void SetGOPSizeMin(uint32_t v);
+			uint32_t GetGOPSizeMin();
+
+			void SetGOPSizeMax(uint32_t v);
+			uint32_t GetGOPSizeMax();
+
+			virtual void SetGOPAlignmentEnabled(bool v) override;
+			virtual bool IsGOPAlignmentEnabled() override;
+
+			virtual void SetIDRPeriod(uint32_t v) override; // Distance in GOPs
+			virtual uint32_t GetIDRPeriod() override;
+
+			void SetHeaderInsertionMode(H265::HeaderInsertionMode v);
+			H265::HeaderInsertionMode GetHeaderInsertionMode();
+
+			virtual void SetDeblockingFilterEnabled(bool v) override;
+			virtual bool IsDeblockingFilterEnabled() override;
+
+			/// Motion Estimation
+			virtual void SetMotionEstimationQuarterPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationQuarterPixelEnabled() override;
+
+			virtual void SetMotionEstimationHalfPixelEnabled(bool v) override;
+			virtual bool IsMotionEstimationHalfPixelEnabled() override;
+
+			// Dynamic
+			virtual void SetFrameSkippingEnabled(bool v) override;
+			virtual bool IsFrameSkippingEnabled() override;
+
+			virtual void SetEnforceHRDEnabled(bool v) override;
+			virtual bool IsEnforceHRDEnabled() override;
+
+			virtual void SetFillerDataEnabled(bool v) override;
+			virtual bool IsFillerDataEnabled() override;
+
+			void SetIFrameQPMinimum(uint8_t v);
+			uint8_t GetIFrameQPMinimum();
+
+			void SetIFrameQPMaximum(uint8_t v);
+			uint8_t GetIFrameQPMaximum();
+
+			void SetPFrameQPMinimum(uint8_t v);
+			uint8_t GetPFrameQPMinimum();
+
+			void SetPFrameQPMaximum(uint8_t v);
+			uint8_t GetPFrameQPMaximum();
+
+			virtual std::pair<uint64_t, uint64_t> CapsTargetBitrate() override;
+			virtual void SetTargetBitrate(uint64_t v) override;
+			virtual uint64_t GetTargetBitrate() override;
+
+			virtual std::pair<uint64_t, uint64_t> CapsPeakBitrate() override;
+			virtual void SetPeakBitrate(uint64_t v) override;
+			virtual uint64_t GetPeakBitrate() override;
+
+			virtual void SetIFrameQP(uint8_t v) override;
+			virtual uint8_t GetIFrameQP() override;
+
+			virtual void SetPFrameQP(uint8_t v) override;
+			virtual uint8_t GetPFrameQP() override;
+
+			virtual void SetMaximumAccessUnitSize(uint32_t v) override;
+			virtual uint32_t GetMaximumAccessUnitSize() override;
+
+			/// Intra-Refresh
+			void SetIntraRefreshMode(uint32_t v);	// Description is identical to IntraRefreshNumMBsPerSlot?
+			uint32_t GetIntraRefreshMode();			// Does not seem to be an actual property yet.
+			
+			void SetIntraRefreshFrameNum(uint32_t v);
+			uint32_t GetIntraRefreshFrameNum();

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/amf-encoder.h Added

@@ -0,0 +1,476 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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
+
+#include <vector>
+#include <queue>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
+#include <chrono>
+
+#include "plugin.h"
+#include "amf.h"
+#include "api-base.h"
+
+#include "components/Component.h"
+
+#define AMF_TIMESTAMP_ALLOCATE	L"TS_Allocate"
+#define AMF_TIME_ALLOCATE		L"T_Allocate"
+#define AMF_TIMESTAMP_STORE		L"TS_Store"
+#define AMF_TIME_STORE			L"T_Store"
+#define AMF_TIMESTAMP_CONVERT	L"TS_Convert"
+#define AMF_TIME_CONVERT		L"T_Convert"
+#define AMF_TIMESTAMP_SUBMIT	L"TS_Submit"
+#define AMF_TIMESTAMP_QUERY		L"TS_Query"
+#define AMF_TIME_MAIN			L"T_Main" // Time between Submit and Query
+
+#define AMF_PRESENT_TIMESTAMP	L"PTS"
+
+#ifdef _DEBUG
+#define AMFTRACECALL { \
+	std::mbstate_t state = std::mbstate_t(); \
+	auto trace = AMF::Instance()->GetTrace(); \
+	const char* file = __FILE__; \
+	const char* fname = __FUNCTION_NAME__; \
+	std::vector<wchar_t> buf(std::mbsrtowcs(NULL, &file, 0, &state) + 1); \
+	std::mbsrtowcs(buf.data(), &file, buf.size(), &state); \
+	std::vector<wchar_t> buf2(std::mbsrtowcs(NULL, &fname, 0, &state) + 1); \
+	std::mbsrtowcs(buf2.data(), &fname, buf2.size(), &state); \
+	trace->TraceW(buf.data(), __LINE__, AMF_TRACE_DEBUG, L"Trace", 1, L"Function: %s", buf2.data()); \
+	PLOG_DEBUG("<Trace> " __FUNCTION_NAME__); \
+};
+#else
+#define AMFTRACECALL ;
+#endif
+
+namespace Plugin {
+	namespace AMD {
+		// Initialization Parameters
+		enum class Codec : uint8_t {
+			AVC,
+			SVC,
+			HEVC,
+		};
+		enum class ColorFormat : uint8_t {
+			/*	Support Table
+			 *	Open Broadcaster	AMD AMF
+			 *	-- 4:2:0 Formats --
+			 *	VIDEO_FORMAT_I420	AMF_SURFACE_YUV420P
+			 *	VIDEO_FORMAT_NV12	AMF_SURFACE_NV12
+			 *						AMF_SURFACE_YV12
+			 *	-- 4:2:2 Formats --
+			 *	VIDEO_FORMAT_YVYV
+			 *	VIDEO_FORMAT_YUY2	AMF_SURFACE_YUY2
+			 *	VIDEO_FORMAT_UYVY
+			 *
+			 *	-- 4:4:4 Formats --
+			 *	VIDEO_FORMAT_I444
+			 *
+			 *	-- Packed Uncompressed Formats --
+			 *	VIDEO_FORMAT_RGBA	AMF_SURFACE_RGBA
+			 *	VIDEO_FORMAT_BGRA	AMF_SURFACE_BGRA
+			 *						AMF_SURFACE_ARGB
+			 *	VIDEO_FORMAT_BGRX
+			 *
+			 *	-- Single/Dual Channel Formats --
+			 *	VIDEO_FORMAT_Y800	AMF_SURFACE_GRAY8
+			 *						AMF_SURFACE_U8V8
+			 *
+			 *	-- HDR Color Formats --
+			 *						AMF_SURFACE_P010
+			 *						AMF_SURFACE_RGBA_F16
+			 */
+
+			I420,
+			NV12,
+			YUY2,
+			BGRA,
+			RGBA,
+			GRAY,
+		};
+		enum class ColorSpace : uint8_t {
+			BT601,
+			BT709,
+			BT2020,
+		};
+
+		// Properties
+		enum class Usage : uint8_t {
+			Transcoding,
+			UltraLowLatency,
+			LowLatency,
+			Webcam
+		};
+		enum class QualityPreset : uint8_t {
+			Speed,
+			Balanced,
+			Quality,
+		};
+		enum class Profile : uint16_t {
+			ConstrainedBaseline = 256,
+			Baseline = 66,
+			Main = 77,
+			ConstrainedHigh = 257,
+			High = 100,
+		};
+		enum class ProfileLevel : uint8_t {
+			Automatic,
+			L10 = 10,
+			L11,
+			L12,
+			L13,
+			L20 = 20,
+			L21,
+			L22,
+			L30 = 30,
+			L31,
+			L32,
+			L40 = 40,
+			L41,
+			L42,
+			L50 = 50,
+			L51,
+			L52,
+			L60 = 60,
+			L61,
+			L62,
+		};
+		enum class CodingType : uint8_t {
+			Automatic,
+			CALVC,
+			CABAC,
+		};
+		enum class RateControlMethod : uint8_t {
+			ConstantQP,
+			LatencyConstrainedVariableBitrate,
+			PeakConstrainedVariableBitrate,
+			ConstantBitrate,
+		};
+		enum class PrePassMode : uint8_t {
+			Disabled,
+			Enabled,
+			EnabledAtHalfScale,
+			EnabledAtQuarterScale,
+		};
+		enum class SliceControlMode : uint8_t {
+			Unknown0,
+			Unknown1,
+			Unknown2,
+			Unknown3,
+		};
+
+		class Encoder {
+			protected:
+			Encoder(Codec codec,
+				std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+				bool useOpenCLSubmission, bool useOpenCLConversion,
+				ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
+				bool useAsyncQueue, size_t asyncQueueSize);
+			public:
+			virtual ~Encoder();
+
+			public:
+
+			#pragma region Initialization
+			uint64_t GetUniqueId();
+

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/amf.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/amf.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -50,13 +50,20 @@
 		class AMF {
 			#pragma region Singleton
 			public:
-			static std::shared_ptr<Plugin::AMD::AMF> GetInstance();
-			#pragma endregion Singleton
+			static void Initialize();
+			static AMF* Instance();
+			static void Finalize();
 
-			public:
+			private: // Private Initializer & Finalizer
 			AMF();
 			~AMF();
 
+			public: // Remove all Copy operators
+			AMF(AMF const&) = delete;
+			void operator=(AMF const&) = delete;
+			#pragma endregion Singleton
+
+			public:
 			amf::AMFFactory* GetFactory();
 			amf::AMFTrace* GetTrace();
 			amf::AMFDebug* GetDebug();
@@ -68,7 +75,7 @@
 			
 			/// AMF Values
 			HMODULE m_AMFModule;
-			uint64_t m_AMFVersion_Compiler;
+			uint64_t m_AMFVersion_Plugin;
 			uint64_t m_AMFVersion_Runtime;
 
 			/// AMF Functions

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/api-base.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/api-base.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,32 +23,43 @@
 */
 
 #pragma once
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "plugin.h"
-
 #include <vector>
 #include <map>
+#include <string.h>
+#include <memory>
 
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 namespace Plugin {
 	namespace API {
-		enum class Type {
+		/**
+		 *
+		 */
+		enum class Type : uint8_t {
 			Host,
 			Direct3D9,
 			Direct3D11,
 			OpenGL,
 		};
 
+		// An Adapter on an API
 		struct Adapter {
 			int32_t idLow, idHigh;
 			std::string Name;
 
-			Adapter() : idLow(0), idHigh(0), Name("Invalid Device") {}
-			Adapter(int32_t idLow, int32_t idHigh, std::string Name) : idLow(idLow), idHigh(idHigh), Name(Name) {}
+			Adapter()
+				: idLow(0), idHigh(0), Name("Invalid Device") {}
+			Adapter(int32_t p_idLow, int32_t p_idHigh, std::string p_Name)
+				: idLow(p_idLow), idHigh(p_idHigh), Name(p_Name) {}
+			Adapter(Adapter const& o) {
+				idLow = o.idLow;
+				idHigh = o.idHigh;
+				Name = o.Name;
+			}
+			void operator=(Adapter const& o) {
+				idLow = o.idLow;
+				idHigh = o.idHigh;
+				Name = o.Name;
+			}
 
 			friend bool operator<(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
 			friend bool operator>(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
@@ -59,35 +70,41 @@
 			friend bool operator!=(const Plugin::API::Adapter& left, const Plugin::API::Adapter& right);
 		};
 
-		class Base {
-			//////////////////////////////////////////////////////////////////////////
-			// API Index
-			//////////////////////////////////////////////////////////////////////////
+		// Instance of an API Adapter
+		struct Instance {
 			public:
-			static void Initialize();
-
-			static size_t GetAPICount();
-			static std::shared_ptr<Base> GetAPIInstance(size_t index);
-			static std::string GetAPIName(size_t index);
-			static std::shared_ptr<Base> GetAPIByName(std::string name);
-			static std::vector<std::shared_ptr<Base>> EnumerateAPIs();
-			static std::vector<std::string> EnumerateAPINames();
-
-			//////////////////////////////////////////////////////////////////////////
-			// API
-			//////////////////////////////////////////////////////////////////////////
+			Instance();
+			virtual ~Instance();
+
+			virtual Adapter GetAdapter() = 0;
+			virtual void* GetContext() = 0;
+		};
+
+		// API Interface
+		class IAPI {
 			public:
+			IAPI();
+			virtual ~IAPI();
+
 			virtual std::string GetName() = 0;
 			virtual Type GetType() = 0;
 
 			virtual std::vector<Adapter> EnumerateAdapters() = 0;
-			virtual Adapter GetAdapterById(uint32_t idLow, uint32_t idHigh) = 0;
-			virtual Adapter GetAdapterByName(std::string name) = 0;
+			Adapter GetAdapterById(int32_t idLow, int32_t idHigh);
+			Adapter GetAdapterByName(std::string name);
 
-			virtual void* CreateInstanceOnAdapter(Adapter adapter) = 0;
-			virtual Adapter GetAdapterForInstance(void* instance) = 0;
-			virtual void* GetContextFromInstance(void* instance) = 0;
-			virtual void DestroyInstance(void* instance) = 0;
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) = 0;
 		};
+
+		// Static API Stuff
+		void InitializeAPIs();
+		void FinalizeAPIs();
+		size_t CountAPIs();
+		std::string GetAPIName(size_t index);
+		std::shared_ptr<IAPI> GetAPI(size_t index);
+		std::shared_ptr<IAPI> GetAPI(std::string name);
+		std::shared_ptr<IAPI> GetAPI(Type type);
+		std::vector<std::shared_ptr<IAPI>> EnumerateAPIs();
+		std::vector<std::string> EnumerateAPINames();
 	}
 }
\ No newline at end of file

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/api-d3d11.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/api-d3d11.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,30 +23,50 @@
 */
 
 #pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-base.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
+#include <vector>
+#include <map>
+#include <mutex>
+#include <dxgi.h>
+#include <d3d11.h>
+#include <atlutil.h>
 
 namespace Plugin {
 	namespace API {
-		class Direct3D11 : public Base {
+		class Direct3D11 : public IAPI {
+			friend class Direct3D11Instance;
+			public:
+
+			Direct3D11();
+			~Direct3D11();
+
 			virtual std::string GetName() override;
 			virtual Type GetType() override;
-
 			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual Adapter GetAdapterById(uint32_t idLow, uint32_t idHigh) override;
-			virtual Adapter GetAdapterByName(std::string name) override;
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+
+			protected:
+			ATL::CComPtr<IDXGIFactory1> m_DXGIFactory;
+			//std::mutex m_InstanceMapMutex;
+			//std::map<std::pair<int32_t, int32_t>, std::shared_ptr<Instance>> m_InstanceMap;
+
+			private:
+			std::vector<Adapter> m_AdapterList;
+		};
+
+		class Direct3D11Instance : public Instance {
+			public:
+			Direct3D11Instance(Direct3D11* api, Adapter adapter);
+			~Direct3D11Instance();
+
+			virtual Adapter GetAdapter() override;
+			virtual void* GetContext() override;
 
-			virtual void* CreateInstanceOnAdapter(Adapter adapter) override;
-			virtual Adapter GetAdapterForInstance(void* pInstance) override;
-			virtual void* GetContextFromInstance(void* pInstance) override;
-			virtual void DestroyInstance(void* pInstance) override;
+			private:
+			Direct3D11* m_API;
+			Adapter m_Adapter;
+			ID3D11DeviceContext* m_DeviceContext;
+			ID3D11Device* m_Device;
 		};
 	}
 }

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/api-d3d9.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/api-d3d9.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,30 +23,49 @@
 */
 
 #pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-base.h"
+#include <d3d9.h>
+#include <atlutil.h>
 
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
+#ifdef _DEBUG
+#define D3D_DEBUG_INFO
+#endif
+#pragma comment(lib, "d3d9.lib")
 
 namespace Plugin {
 	namespace API {
-		class Direct3D9 : public Base {
+		class Direct3D9 : public IAPI {
+			friend class Direct3D9Instance;
+			public:
+
+			Direct3D9();
+			~Direct3D9();
+
 			virtual std::string GetName() override;
 			virtual Type GetType() override;
-
 			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual Adapter GetAdapterById(uint32_t idLow, uint32_t idHigh);
-			virtual Adapter GetAdapterByName(std::string name);
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+
+			protected:
+			IDirect3D9Ex* m_Direct3D9Ex;
+			//std::map<std::pair<int32_t, int32_t>, std::shared_ptr<Instance>> m_InstanceMap;
+
+			private:
+			std::vector<Adapter> m_Adapters;
+		};
+
+		class Direct3D9Instance : public Instance {
+			public:
+			Direct3D9Instance(Direct3D9* api, Adapter adapter);
+			~Direct3D9Instance();
+
+			virtual Adapter GetAdapter() override;
+			virtual void* GetContext() override;
 
-			virtual void* CreateInstanceOnAdapter(Adapter adapter) override;
-			virtual Adapter GetAdapterForInstance(void* pInstance) override;
-			virtual void* GetContextFromInstance(void* pInstance) override;
-			virtual void DestroyInstance(void* pInstance) override;
+			private:
+			Direct3D9* m_API;
+			Adapter m_Adapter;
+			IDirect3DDevice9Ex* m_Device;
 		};
 	}
 }

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/api-host.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/api-host.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,30 +23,22 @@
 */
 
 #pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-base.h"
 
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-
 namespace Plugin {
 	namespace API {
-		class Host : public Base {
+		class Host : public IAPI {
+			public:
 			virtual std::string GetName() override;
 			virtual Type GetType() override;
-
 			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual Adapter GetAdapterById(uint32_t idLow, uint32_t idHigh);
-			virtual Adapter GetAdapterByName(std::string name);
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+		};
 
-			virtual void* CreateInstanceOnAdapter(Adapter adapter) override;
-			virtual Adapter GetAdapterForInstance(void* pInstance) override;
-			virtual void* GetContextFromInstance(void* pInstance) override;
-			virtual void DestroyInstance(void* pInstance) override;
+		class HostInstance : public Instance {
+			public:
+			virtual Adapter GetAdapter() override;
+			virtual void* GetContext() override;
 		};
 	}
 }

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/api-opengl.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/api-opengl.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,30 +23,36 @@
 */
 
 #pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-base.h"
 
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#include <gl/GL.h>
 
 namespace Plugin {
 	namespace API {
-		class OpenGL : public Base {
+		class OpenGL : public IAPI {
+			public:
+			OpenGL();
+			~OpenGL();
+
 			virtual std::string GetName() override;
 			virtual Type GetType() override;
-
 			virtual std::vector<Adapter> EnumerateAdapters() override;
-			virtual Adapter GetAdapterById(uint32_t idLow, uint32_t idHigh);
-			virtual Adapter GetAdapterByName(std::string name);
+			virtual std::shared_ptr<Instance> CreateInstance(Adapter adapter) override;
+		};
+
+		class OpenGLInstance : public Instance {
+			public:
+			OpenGLInstance();
+			~OpenGLInstance();
+
+			virtual Adapter GetAdapter() override;
+			virtual void* GetContext() override;
 
-			virtual void* CreateInstanceOnAdapter(Adapter adapter) override;
-			virtual Adapter GetAdapterForInstance(void* instance) override;
-			virtual void* GetContextFromInstance(void* instance) override;
-			virtual void DestroyInstance(void* instance) override;
+			private:
+			Adapter adapter;
 		};
 	}
 }

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/enc-h264.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/enc-h264.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,165 +23,9 @@
 */
 
 #pragma once
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-// Plugin
+#include "amf-encoder-h264.h"
 #include "plugin.h"
-#include "amf-capabilities.h"
-#include "amf-h264.h"
 
-//////////////////////////////////////////////////////////////////////////
-// Defines - Translation Strings
-//////////////////////////////////////////////////////////////////////////
-
-// Presets
-#define AMF_H264_PRESET										TEXT_AMF_H264("Preset")
-#define AMF_H264_PRESET_RESETTODEFAULTS						TEXT_AMF_H264("Preset.ResetToDefaults")
-#define AMF_H264_PRESET_RECORDING							TEXT_AMF_H264("Preset.Recording")
-#define AMF_H264_PRESET_HIGHQUALITY							TEXT_AMF_H264("Preset.HighQuality")
-#define AMF_H264_PRESET_INDISTINGUISHABLE					TEXT_AMF_H264("Preset.Indistinguishable")
-#define AMF_H264_PRESET_LOSSLESS							TEXT_AMF_H264("Preset.Lossless")
-#define AMF_H264_PRESET_TWITCH								TEXT_AMF_H264("Preset.Twitch")
-#define AMF_H264_PRESET_YOUTUBE								TEXT_AMF_H264("Preset.YouTube")
-
-// Startup Properties
-#define AMF_H264_USAGE										TEXT_AMF_H264("Usage")
-#define AMF_H264_USAGE_DESCRIPTION							TEXT_AMF_H264("Usage.Description")
-#define AMF_H264_USAGE_TRANSCODING							TEXT_AMF_H264("Usage.Transcoding")
-#define AMF_H264_USAGE_ULTRALOWLATENCY						TEXT_AMF_H264("Usage.UltraLowLatency")
-#define AMF_H264_USAGE_LOWLATENCY							TEXT_AMF_H264("Usage.LowLatency")
-#define AMF_H264_USAGE_WEBCAM								TEXT_AMF_H264("Usage.Webcam")
-#define AMF_H264_QUALITY_PRESET								TEXT_AMF_H264("QualityPreset")
-#define AMF_H264_QUALITY_PRESET_DESCRIPTION					TEXT_AMF_H264("QualityPreset.Description")
-#define AMF_H264_QUALITY_PRESET_SPEED						TEXT_AMF_H264("QualityPreset.Speed")
-#define AMF_H264_QUALITY_PRESET_BALANCED					TEXT_AMF_H264("QualityPreset.Balanced")
-#define AMF_H264_QUALITY_PRESET_QUALITY						TEXT_AMF_H264("QualityPreset.Quality")
-#define AMF_H264_PROFILE									TEXT_AMF_H264("Profile")
-#define AMF_H264_PROFILE_DESCRIPTION						TEXT_AMF_H264("Profile.Description")
-#define AMF_H264_PROFILELEVEL								TEXT_AMF_H264("ProfileLevel")
-#define AMF_H264_PROFILELEVEL_DESCRIPTION					TEXT_AMF_H264("ProfileLevel.Description")
-
-// Rate Control Properties
-#define AMF_H264_RATECONTROLMETHOD							TEXT_AMF_H264("RateControlMethod")
-#define AMF_H264_RATECONTROLMETHOD_DESCRIPTION				TEXT_AMF_H264("RateControlMethod.Description")
-#define AMF_H264_RATECONTROLMETHOD_CQP						TEXT_AMF_H264("RateControlMethod.CQP")
-#define AMF_H264_RATECONTROLMETHOD_CBR						TEXT_AMF_H264("RateControlMethod.CBR")
-#define AMF_H264_RATECONTROLMETHOD_VBR						TEXT_AMF_H264("RateControlMethod.VBR.Peak")
-#define AMF_H264_RATECONTROLMETHOD_VBR_LAT					TEXT_AMF_H264("RateControlMethod.VBR.Latency")
-#define AMF_H264_BITRATE_TARGET								TEXT_AMF_H264("Bitrate.Target")
-#define AMF_H264_BITRATE_TARGET_DESCRIPTION					TEXT_AMF_H264("Bitrate.Target.Description")
-#define AMF_H264_BITRATE_PEAK								TEXT_AMF_H264("Bitrate.Peak")
-#define AMF_H264_BITRATE_PEAK_DESCRIPTION					TEXT_AMF_H264("Bitrate.Peak.Description")
-#define AMF_H264_QP_MINIMUM									TEXT_AMF_H264("QP.Minimum")
-#define AMF_H264_QP_MINIMUM_DESCRIPTION						TEXT_AMF_H264("QP.Minimum.Description")
-#define AMF_H264_QP_MAXIMUM									TEXT_AMF_H264("QP.Maximum")
-#define AMF_H264_QP_MAXIMUM_DESCRIPTION						TEXT_AMF_H264("QP.Maximum.Description")
-#define AMF_H264_QP_IFRAME									TEXT_AMF_H264("QP.IFrame")
-#define AMF_H264_QP_IFRAME_DESCRIPTION						TEXT_AMF_H264("QP.IFrame.Description")
-#define AMF_H264_QP_PFRAME									TEXT_AMF_H264("QP.PFrame")
-#define AMF_H264_QP_PFRAME_DESCRIPTION						TEXT_AMF_H264("QP.PFrame.Description")
-#define AMF_H264_QP_BFRAME									TEXT_AMF_H264("QP.BFrame")
-#define AMF_H264_QP_BFRAME_DESCRIPTION						TEXT_AMF_H264("QP.BFrame.Description")
-#define AMF_H264_VBVBUFFER									TEXT_AMF_H264("VBVBuffer")
-#define AMF_H264_VBVBUFFER_DESCRIPTION						TEXT_AMF_H264("VBVBuffer.Description")
-#define AMF_H264_VBVBUFFER_STRICTNESS						TEXT_AMF_H264("VBVBuffer.Strictness")
-#define AMF_H264_VBVBUFFER_STRICTNESS_DESCRIPTION			TEXT_AMF_H264("VBVBuffer.Strictness.Description")
-#define AMF_H264_VBVBUFFER_SIZE								TEXT_AMF_H264("VBVBuffer.Size")
-#define AMF_H264_VBVBUFFER_SIZE_DESCRIPTION					TEXT_AMF_H264("VBVBuffer.Size.Description")
-#define AMF_H264_VBVBUFFER_FULLNESS							TEXT_AMF_H264("VBVBuffer.Fullness")
-#define AMF_H264_VBVBUFFER_FULLNESS_DESCRIPTION				TEXT_AMF_H264("VBVBuffer.Fullness.Description")
-#define AMF_H264_FILLERDATA									TEXT_AMF_H264("FillerData")
-#define AMF_H264_FILLERDATA_DESCRIPTION						TEXT_AMF_H264("FillerData.Description")
-#define AMF_H264_FRAMESKIPPING								TEXT_AMF_H264("FrameSkipping")
-#define AMF_H264_FRAMESKIPPING_DESCRIPTION					TEXT_AMF_H264("FrameSkipping.Description")
-#define AMF_H264_ENFORCEHRDCOMPATIBILITY					TEXT_AMF_H264("EnforceHRDCompatibility")
-#define AMF_H264_ENFORCEHRDCOMPATIBILITY_DESCRIPTION		TEXT_AMF_H264("EnforceHRDCompatibility.Description")
-
-// Picture Control Properties
-#define AMF_H264_KEYFRAME_INTERVAL							TEXT_AMF_H264("KeyframeInterval")
-#define AMF_H264_KEYFRAME_INTERVAL_DESCRIPTION				TEXT_AMF_H264("KeyframeInterval.Description")
-#define AMF_H264_IDR_PERIOD									TEXT_AMF_H264("IDRPeriod")
-#define AMF_H264_IDR_PERIOD_DESCRIPTION						TEXT_AMF_H264("IDRPeriod.Description")
-#define AMF_H264_BFRAME_PATTERN								TEXT_AMF_H264("BFrame.Pattern")
-#define AMF_H264_BFRAME_PATTERN_DESCRIPTION					TEXT_AMF_H264("BFrame.Pattern.Description")
-#define AMF_H264_BFRAME_DELTAQP								TEXT_AMF_H264("BFrame.DeltaQP")
-#define AMF_H264_BFRAME_DELTAQP_DESCRIPTION					TEXT_AMF_H264("BFrame.DeltaQP.Description")
-#define AMF_H264_BFRAME_REFERENCE							TEXT_AMF_H264("BFrame.Reference")
-#define AMF_H264_BFRAME_REFERENCE_DESCRIPTION				TEXT_AMF_H264("BFrame.Reference.Description")
-#define AMF_H264_BFRAME_REFERENCEDELTAQP					TEXT_AMF_H264("BFrame.ReferenceDeltaQP")
-#define AMF_H264_BFRAME_REFERENCEDELTAQP_DESCRIPTION		TEXT_AMF_H264("BFrame.ReferenceDeltaQP.Description")
-#define AMF_H264_DEBLOCKINGFILTER							TEXT_AMF_H264("DeblockingFilter")
-#define AMF_H264_DEBLOCKINGFILTER_DESCRIPTION				TEXT_AMF_H264("DeblockingFilter.Description")
-
-// Miscellaneous Properties
-#define AMF_H264_SCANTYPE									TEXT_AMF_H264("ScanType")
-#define AMF_H264_SCANTYPE_DESCRIPTION						TEXT_AMF_H264("ScanType.Description")
-#define AMF_H264_SCANTYPE_PROGRESSIVE						TEXT_AMF_H264("ScanType.Progressive")
-#define AMF_H264_SCANTYPE_INTERLACED						TEXT_AMF_H264("ScanType.Interlaced")
-#define AMF_H264_MOTIONESTIMATION							TEXT_AMF_H264("MotionEstimation")
-#define AMF_H264_MOTIONESTIMATION_DESCRIPTION				TEXT_AMF_H264("MotionEstimation.Description")
-#define AMF_H264_MOTIONESTIMATION_NONE						TEXT_AMF_H264("MotionEstimation.None")
-#define AMF_H264_MOTIONESTIMATION_HALF						TEXT_AMF_H264("MotionEstimation.Half")
-#define AMF_H264_MOTIONESTIMATION_QUARTER					TEXT_AMF_H264("MotionEstimation.Quarter")
-#define AMF_H264_MOTIONESTIMATION_BOTH						TEXT_AMF_H264("MotionEstimation.Both")
-
-// Experimental Properties
-#define AMF_H264_CODINGTYPE									TEXT_AMF_H264("CodingType")
-#define AMF_H264_CODINGTYPE_DESCRIPTION						TEXT_AMF_H264("CodingType.Description")
-#define AMF_H264_MAXIMUMLTRFRAMES							TEXT_AMF_H264("MaximumLTRFrames")
-#define AMF_H264_MAXIMUMLTRFRAMES_DESCRIPTION				TEXT_AMF_H264("MaximumLTRFrames.Description")
-#define AMF_H264_MAXIMUMACCESSUNITSIZE						TEXT_AMF_H264("MaximumAccessUnitSize")
-#define AMF_H264_MAXIMUMACCESSUNITSIZE_DESCRIPTION			TEXT_AMF_H264("MaximumAccessUnitSize.Description")
-#define AMF_H264_HEADER_INSERTION_SPACING					TEXT_AMF_H264("HeaderInsertionSpacing")
-#define AMF_H264_HEADER_INSERTION_SPACING_DESCRIPTION		TEXT_AMF_H264("HeaderInsertionSpacing.Description")
-#define AMF_H264_WAITFORTASK								TEXT_AMF_H264("WaitForTask")
-#define AMF_H264_WAITFORTASK_DESCRIPTION					TEXT_AMF_H264("WaitForTask.Description")
-#define AMF_H264_PREANALYSISPASS							TEXT_AMF_H264("PreanalysisPass")
-#define AMF_H264_PREANALYSISPASS_DESCRIPTION				TEXT_AMF_H264("PreanalysisPass.Description")
-#define AMF_H264_VBAQ										TEXT_AMF_H264("VBAQ")
-#define AMF_H264_VBAQ_DESCRIPTION							TEXT_AMF_H264("VBAQ.Description")
-#define AMF_H264_GOPSIZE									TEXT_AMF_H264("GOPSize")
-#define AMF_H264_GOPSIZE_DESCRIPTION						TEXT_AMF_H264("GOPSize.Description")
-#define AMF_H264_GOPALIGNMENT								TEXT_AMF_H264("GOPAlignment")
-#define AMF_H264_GOPALIGNMENT_DESCRIPTION					TEXT_AMF_H264("GOPAlignment.Description")
-#define AMF_H264_MAXIMUMREFERENCEFRAMES						TEXT_AMF_H264("MaximumReferenceFrames")
-#define AMF_H264_MAXIMUMREFERENCEFRAMES_DESCRIPTION			TEXT_AMF_H264("MaximumReferenceFrames.Description")
-#define AMF_H264_SLICESPERFRAME								TEXT_AMF_H264("SlicesPerFrame")
-#define AMF_H264_SLICESPERFRAME_DESCRIPTION					TEXT_AMF_H264("SlicesPerFrame.Description")
-#define AMF_H264_SLICEMODE									TEXT_AMF_H264("SliceMode")
-#define AMF_H264_SLICEMODE_DESCRIPTION						TEXT_AMF_H264("SliceMode.Description")
-#define AMF_H264_MAXIMUMSLICESIZE							TEXT_AMF_H264("MaximumSliceSize")
-#define AMF_H264_MAXIMUMSLICESIZE_DESCRIPTION				TEXT_AMF_H264("MaximumSliceSize.Description")
-#define AMF_H264_SLICECONTROLMODE							TEXT_AMF_H264("SliceControlMode")
-#define AMF_H264_SLICECONTROLMODE_DESCRIPTION				TEXT_AMF_H264("SliceControlMode.Description")
-#define AMF_H264_SLICECONTROLSIZE							TEXT_AMF_H264("SliceControlSize")
-#define AMF_H264_SLICECONTROLSIZE_DESCRIPTION				TEXT_AMF_H264("SliceControlSize.Description")
-#define AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES				TEXT_AMF_H264("IntraRefresh.NumberOfStripes")
-#define AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES_DESCRIPTION	TEXT_AMF_H264("IntraRefresh.NumberOfStripes.Description")
-#define AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT			TEXT_AMF_H264("IntraRefresh.MacroblocksPerSlot")
-#define AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT_DESCRIPTION	TEXT_AMF_H264("IntraRefresh.MacroblocksPerSlot.Description")
-
-// System Properties
-#define AMF_H264_VIDEOAPI									TEXT_AMF_H264("VideoAPI")
-#define AMF_H264_VIDEOAPI_DESCRIPTION						TEXT_AMF_H264("VideoAPI.Description")
-#define AMF_H264_VIDEOADAPTER								TEXT_AMF_H264("VideoAdapter")
-#define AMF_H264_VIDEOADAPTER_DESCRIPTION					TEXT_AMF_H264("VideoAdapter.Description")
-#define AMF_H264_OPENCL										TEXT_AMF_H264("OpenCL")
-#define AMF_H264_OPENCL_DESCRIPTION							TEXT_AMF_H264("OpenCL.Description")
-#define AMF_H264_VIEW										TEXT_AMF_H264("View")
-#define AMF_H264_VIEW_DESCRIPTION							TEXT_AMF_H264("View.Description")
-#define AMF_H264_VIEW_BASIC									TEXT_AMF_H264("View.Basic")
-#define AMF_H264_VIEW_ADVANCED								TEXT_AMF_H264("View.Advanced")
-#define AMF_H264_VIEW_EXPERT								TEXT_AMF_H264("View.Expert")
-#define AMF_H264_VIEW_MASTER								TEXT_AMF_H264("View.Master")
-#define AMF_H264_DEBUG										TEXT_AMF_H264("Debug")
-#define AMF_H264_DEBUG_DESCRIPTION							TEXT_AMF_H264("Debug.Description")
-#define AMF_H264_VERSION									TEXT_AMF_H264("Version")
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 namespace Plugin {
 	namespace Interface {
 		class H264Interface {
@@ -217,7 +61,8 @@
 			// Storage
 			//////////////////////////////////////////////////////////////////////////
 			private:
-			Plugin::AMD::H264Encoder* m_VideoEncoder;
+			std::unique_ptr<Plugin::AMD::EncoderH264> m_VideoEncoder;
+			obs_encoder_t* m_Encoder;
 		};
 	}
 }
\ No newline at end of file

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/enc-h265.h Added

@@ -0,0 +1,68 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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
+#include "amf-encoder-h265.h"
+#include "plugin.h"
+
+namespace Plugin {
+	namespace Interface {
+		class H265Interface {
+			public:
+			static void encoder_register();
+			static const char* get_name(void* type_data);
+			static void get_defaults(obs_data_t *data);
+			static obs_properties_t* get_properties(void* ptr);
+
+			static bool properties_modified(obs_properties_t *props, obs_property_t *, obs_data_t *data);
+
+			static void* create(obs_data_t* settings, obs_encoder_t* encoder);
+			static void destroy(void* ptr);
+			static bool update(void *ptr, obs_data_t *data);
+			static bool encode(void *ptr, struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet);
+			static void get_video_info(void *ptr, struct video_scale_info *info);
+			static bool get_extra_data(void *ptr, uint8_t** extra_data, size_t* size);
+
+			//////////////////////////////////////////////////////////////////////////
+			// Module Code
+			//////////////////////////////////////////////////////////////////////////
+			public:
+
+			H265Interface(obs_data_t* data, obs_encoder_t* encoder);
+			~H265Interface();
+
+			bool update(obs_data_t* data);
+			bool encode(struct encoder_frame * frame, struct encoder_packet * packet, bool * received_packet);
+			void get_video_info(struct video_scale_info* info);
+			bool get_extra_data(uint8_t** extra_data, size_t* size);
+
+			//////////////////////////////////////////////////////////////////////////
+			// Storage
+			//////////////////////////////////////////////////////////////////////////
+			private:
+			std::unique_ptr<Plugin::AMD::EncoderH265> m_VideoEncoder;
+			obs_encoder_t* m_Encoder;
+		};
+	}
+}
\ No newline at end of file

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Include/plugin.h -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/plugin.h Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,62 +23,53 @@
 */
 
 #pragma once
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
+#define NOMINMAX
+#define NOINOUT
 
-// Microsoft as always does not follow the standard and declares safe functions unsafe.
-// Or even straight up marks them as deprecated, what the fuck Microsoft?
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#pragma warning(disable : 4996)
-#endif
-
-#include <cstdint>
-#include <inttypes.h>
-#include <exception>
-#include <stdexcept>
-#include <thread>
-#include <memory>
-
-// Open Broadcaster Software
-#pragma warning( disable: 4201 )
+#pragma warning (push)
+#pragma warning (disable: 4201)
 #include "libobs/obs-module.h"
-#include "libobs/obs-encoder.h"
+#include "libobs/util/platform.h"
+#pragma warning (pop)
 
-MODULE_EXTERN const char *obs_module_text_multi(const char *val, uint8_t depth = (uint8_t)1);
+// Plugin
+#define PLUGIN_NAME				"AMD Advanced Media Framework"
+#include "Version.h"
 
-//////////////////////////////////////////////////////////////////////////
-// Defines
-//////////////////////////////////////////////////////////////////////////
+#define PLOG(level, ...)		blog(level, "[AMF] " __VA_ARGS__);
+#define PLOG_ERROR(...)			PLOG(LOG_ERROR,   __VA_ARGS__)
+#define PLOG_WARNING(...)		PLOG(LOG_WARNING, __VA_ARGS__)
+#define PLOG_INFO(...)			PLOG(LOG_INFO,    __VA_ARGS__)
+#define PLOG_DEBUG(...)			PLOG(LOG_DEBUG,   __VA_ARGS__)
 
+// Utility
 #define vstr(s) dstr(s)
 #define dstr(s) #s
-#define clamp(val,low,high) (val > high ? high : (val < low ? low : val))
 
-#include "Version.h"
-#define PLUGIN_VERSION_FULL				(((uint64_t)PLUGIN_VERSION_MAJOR << 48ull) | ((uint64_t)PLUGIN_VERSION_MINOR << 32ull) | ((uint64_t)PLUGIN_VERSION_PATCH) << 16ul | ((uint64_t)PLUGIN_VERSION_BUILD))
-#define PLUGIN_VERSION_TEXT				vstr(PLUGIN_VERSION_MAJOR) "." vstr(PLUGIN_VERSION_MINOR) "." vstr(PLUGIN_VERSION_PATCH) "." vstr(PLUGIN_VERSION_BUILD)
+#define clamp(val,low,high) (val > high ? high : (val < low ? low : val))
+#ifdef max
+#undef max
+#endif
+#define max(val,high) (val > high ? val : high)
+#ifdef min
+#undef min
+#endif
+#define min(val,low ) (val < low  ? val  : low)
 
-#define AMF_LOG(level, format, ...)		blog(level, "[AMF Encoder] " format, ##__VA_ARGS__);
-#define AMF_LOG_ERROR(format, ...)		AMF_LOG(LOG_ERROR,   format, ##__VA_ARGS__)
-#define AMF_LOG_WARNING(format, ...)	AMF_LOG(LOG_WARNING, format, ##__VA_ARGS__)
-#define AMF_LOG_INFO(format, ...)		AMF_LOG(LOG_INFO,    format, ##__VA_ARGS__)
-#define AMF_LOG_CONFIG(format, ...)		AMF_LOG(350,         format, ##__VA_ARGS__)
-#define AMF_LOG_DEBUG(format, ...)		AMF_LOG(LOG_DEBUG,   format, ##__VA_ARGS__)
+#ifdef IN
+#undef IN
+#endif
+#define IN
+#ifdef OUT
+#undef OUT
+#endif
+#define OUT
 
-#define ThrowException(format, ...) {\
-	std::vector<char> _throwexceptionwithamferror_buf(8192);\
-	sprintf_s(_throwexceptionwithamferror_buf.data(), _throwexceptionwithamferror_buf.size(), format, ##__VA_ARGS__);\
-	AMF_LOG_WARNING("%s", _throwexceptionwithamferror_buf.data()); \
-	throw std::exception(_throwexceptionwithamferror_buf.data()); \
-}
-#define ThrowExceptionWithAMFError(format, res, ...) {\
-	std::vector<char> _throwexceptionwithamferror_buf(8192);\
-	sprintf_s(_throwexceptionwithamferror_buf.data(), _throwexceptionwithamferror_buf.size(), format, ##__VA_ARGS__, Plugin::AMD::AMF::GetInstance()->GetTrace()->GetResultText(res), res);\
-	AMF_LOG_WARNING("%s", _throwexceptionwithamferror_buf.data()); \
-	throw std::exception(_throwexceptionwithamferror_buf.data()); \
-}
+#define QUICK_FORMAT_MESSAGE(var, ...) std::string var = ""; { \
+		std::vector<char> QUICK_FORMAT_MESSAGE_buf(1024); \
+		snprintf(QUICK_FORMAT_MESSAGE_buf.data(), QUICK_FORMAT_MESSAGE_buf.size(), __VA_ARGS__); \
+		var = std::string(QUICK_FORMAT_MESSAGE_buf.data()); \
+	}
 
 #ifndef __FUNCTION_NAME__
 #if defined(_WIN32) || defined(_WIN64)   //WINDOWS
@@ -88,33 +79,13 @@
 #endif
 #endif
 
-//////////////////////////////////////////////////////////////////////////
-// Defines - Translation Strings
-//////////////////////////////////////////////////////////////////////////
-
-#define TEXT_T(x)						obs_module_text_multi(x)
-#define TEXT_AMF(x)						("AMF." ## x)
-#define TEXT_AMF_H264(x)				(TEXT_AMF("H264." ## x))
-#define TEXT_AMF_UTIL(x)				(TEXT_AMF("Util." ## x))
-
-// Utility
-#define AMF_UTIL_DEFAULT									TEXT_AMF_UTIL("Default")
-#define AMF_UTIL_AUTOMATIC									TEXT_AMF_UTIL("Automatic")
-#define AMF_UTIL_MANUAL										TEXT_AMF_UTIL("Manual")
-#define AMF_UTIL_TOGGLE_DISABLED							TEXT_AMF_UTIL("Toggle.Disabled")
-#define AMF_UTIL_TOGGLE_ENABLED								TEXT_AMF_UTIL("Toggle.Enabled")
-
-//////////////////////////////////////////////////////////////////////////
-// Threading Specific
-//////////////////////////////////////////////////////////////////////////
-
-#if (defined _WIN32) || (defined _WIN64)
-void SetThreadName(uint32_t dwThreadID, const char* threadName);
-void SetThreadName(const char* threadName);
-void SetThreadName(std::thread* thread, const char* threadName);
-
-#else
-void SetThreadName(std::thread* thread, const char* threadName);
-void SetThreadName(const char* threadName);
-
-#endif
+enum class Presets : int8_t {
+	None = -1,
+	ResetToDefaults = 0,
+	Recording,
+	HighQuality,
+	Indistinguishable,
+	Lossless,
+	Twitch,
+	YouTube,
+};

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/strings.h Added

@@ -0,0 +1,173 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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
+#include "plugin.h"
+#include "utility.h"
+
+#define P_TRANSLATE(x)				Utility::obs_module_text_multi(x)
+#define P_DESC(x)					x ".Description"
+
+// Shared
+#define P_VERSION					"Version"
+#define P_UTIL_DEFAULT				"Utility.Default"
+#define P_UTIL_AUTOMATIC			"Utility.Automatic"
+#define P_UTIL_MANUAL				"Utility.Manual"
+#define P_UTIL_SWITCH_DISABLED		"Utility.Switch.Disabled"
+#define P_UTIL_SWITCH_ENABLED		"Utility.Switch.Enabled"
+
+// Presets
+#define P_PRESET					"Preset"
+#define P_PRESET_RESETTODEFAULTS	"Preset.ResetToDefaults"
+#define P_PRESET_RECORDING			"Preset.Recording"
+#define P_PRESET_HIGHQUALITY		"Preset.HighQuality"
+#define P_PRESET_INDISTINGUISHABLE	"Preset.Indistinguishable"
+#define P_PRESET_LOSSLESS			"Preset.Lossless"
+#define P_PRESET_TWITCH				"Preset.Twitch"
+#define P_PRESET_YOUTUBE			"Preset.YouTube"
+
+// Static
+//#define P_USAGE						"Usage"
+//#define P_USAGE_TRANSCODING			"Usage.Transcoding"
+//#define P_USAGE_ULTRALOWLATENCY		"Usage.UltraLowLatency"
+//#define P_USAGE_LOWLATENCY			"Usage.LowLatency"
+//#define P_USAGE_WEBCAM				"Usage.Webcam"
+#define P_QUALITYPRESET				"QualityPreset"
+#define P_QUALITYPRESET_SPEED		"QualityPreset.Speed"
+#define P_QUALITYPRESET_BALANCED	"QualityPreset.Balanced"
+#define P_QUALITYPRESET_QUALITY		"QualityPreset.Quality"
+#define P_PROFILE					"Profile"
+#define P_PROFILELEVEL				"ProfileLevel"
+#define P_TIER						"Tier"
+#define P_ASPECTRATIO				"AspectRatio"
+#define P_CODINGTYPE				"CodingType"
+#define P_CODINGTYPE_CABAC			"CodingType.CABAC"
+#define P_CODINGTYPE_CAVLC			"CodingType.CAVLC"
+#define P_MAXIMUMREFERENCEFRAMES	"MaximumReferenceFrames"
+
+// Rate Control
+#define P_RATECONTROLMETHOD			"RateControlMethod"
+#define P_RATECONTROLMETHOD_CQP		"RateControlMethod.CQP"
+#define P_RATECONTROLMETHOD_CBR		"RateControlMethod.CBR"
+#define P_RATECONTROLMETHOD_VBR		"RateControlMethod.VBR"
+#define P_RATECONTROLMETHOD_VBRLAT	"RateControlMethod.VBRLAT"
+#define P_PREPASSMODE				"PrePassMode"
+#define P_PREPASSMODE_QUARTER		"PrePassMode.Quarter"
+#define P_PREPASSMODE_HALF			"PrePassMode.Half"
+#define P_PREPASSMODE_FULL			"PrePassMode.Full"
+#define P_BITRATE_TARGET			"Bitrate.Target"
+#define P_BITRATE_PEAK				"Bitrate.Peak"
+#define P_QP_MINIMUM				"QP.Minimum" // H264
+#define P_QP_MAXIMUM				"QP.Maximum" // H264
+#define P_QP_IFRAME					"QP.IFrame"
+#define P_QP_IFRAME_MINIMUM			"QP.IFrame.Minimum" // H265
+#define P_QP_IFRAME_MAXIMUM			"QP.IFrame.Maximum" // H265
+#define P_QP_PFRAME					"QP.PFrame"
+#define P_QP_PFRAME_MINIMUM			"QP.PFrame.Minimum" // H265
+#define P_QP_PFRAME_MAXIMUM			"QP.PFrame.Maximum" // H265
+#define P_QP_BFRAME					"QP.BFrame" // H264
+#define P_FILLERDATA				"FillerData"
+#define P_FRAMESKIPPING				"FrameSkipping"
+#define P_FRAMESKIPPING_PERIOD		"FrameSkipping.Period"
+#define P_FRAMESKIPPING_BEHAVIOUR	"FrameSkipping.Behaviour"
+#define P_FRAMESKIPPING_SKIPNTH		"FrameSkipping.SkipNth"
+#define P_FRAMESKIPPING_KEEPNTH		"FrameSkipping.KeepNth"
+#define P_VBAQ						"VBAQ"
+#define P_ENFORCEHRD				"EnforceHRD"
+
+// VBV Buffer
+#define P_VBVBUFFER					"VBVBuffer"
+#define P_VBVBUFFER_SIZE			"VBVBuffer.Size"
+#define P_VBVBUFFER_STRICTNESS		"VBVBuffer.Strictness"
+#define P_VBVBUFFER_INITIALFULLNESS	"VBVBuffer.InitialFullness"
+
+// Picture Control
+#define P_INTERVAL_KEYFRAME			"Interval.Keyframe"
+#define P_PERIOD_IDR_H264			"Period.IDR.H264" // H264
+#define P_PERIOD_IDR_H265			"Period.IDR.H265" // H265
+#define P_INTERVAL_IFRAME			"Interval.IFrame"
+#define P_PERIOD_IFRAME				"Period.IFrame"
+#define P_INTERVAL_PFRAME			"Interval.PFrame"
+#define P_PERIOD_PFRAME				"Period.PFrame"
+#define P_INTERVAL_BFRAME			"Interval.BFrame"
+#define P_PERIOD_BFRAME				"Period.BFrame"
+#define P_GOP_TYPE					"GOP.Type" // H265
+#define P_GOP_TYPE_FIXED			"GOP.Type.Fixed" // H265
+#define P_GOP_TYPE_VARIABLE			"GOP.Type.Variable" // H265
+#define P_GOP_SIZE					"GOP.Size" // H265
+#define P_GOP_SIZE_MINIMUM			"GOP.Size.Minimum" // H265
+#define P_GOP_SIZE_MAXIMUM			"GOP.Size.Maximum" // H265
+#define P_GOP_ALIGNMENT				"GOP.Alignment"	// Both?
+#define P_BFRAME_PATTERN			"BFrame.Pattern" // H264
+#define P_BFRAME_DELTAQP			"BFrame.DeltaQP" // H264
+#define P_BFRAME_REFERENCE			"BFrame.Reference" // H264
+#define P_BFRAME_REFERENCEDELTAQP	"BFrame.ReferenceDeltaQP" // H264
+#define P_DEBLOCKINGFILTER			"DeblockingFilter"
+#define P_MOTIONESTIMATION			"MotionEstimation"
+#define P_MOTIONESTIMATION_QUARTER	"MotionEstimation.Quarter"
+#define P_MOTIONESTIMATION_HALF		"MotionEstimation.Half"
+#define P_MOTIONESTIMATION_FULL		"MotionEstimation.Full"
+
+// System
+#define P_VIDEO_API					"Video.API"
+#define P_VIDEO_ADAPTER				"Video.Adapter"
+#define P_OPENCL_TRANSFER			"OpenCL.Transfer"
+#define P_OPENCL_CONVERSION			"OpenCL.Conversion"
+#define P_ASYNCHRONOUSQUEUE			"AsynchronousQueue"
+#define P_ASYNCHRONOUSQUEUE_SIZE	"AsynchronousQueue.Size"
+#define P_DEBUG						"Debug"
+
+#define P_VIEW						"View"
+#define P_VIEW_BASIC				"View.Basic"
+#define P_VIEW_ADVANCED				"View.Advanced"
+#define P_VIEW_EXPERT				"View.Expert"
+#define P_VIEW_MASTER				"View.Master"
+enum class ViewMode :uint8_t {
+	Basic,
+	Advanced,
+	Expert,
+	Master
+};
+
+/// Other - Missing Functionality
+//#define AMF_H264_MAXIMUMLTRFRAMES							TEXT_AMF_H264("MaximumLTRFrames")
+//#define AMF_H264_MAXIMUMLTRFRAMES_DESCRIPTION				TEXT_AMF_H264("MaximumLTRFrames.Description")
+//#define AMF_H264_MAXIMUMACCESSUNITSIZE						TEXT_AMF_H264("MaximumAccessUnitSize")
+//#define AMF_H264_MAXIMUMACCESSUNITSIZE_DESCRIPTION			TEXT_AMF_H264("MaximumAccessUnitSize.Description")
+//#define AMF_H264_HEADER_INSERTION_SPACING					TEXT_AMF_H264("HeaderInsertionSpacing")
+//#define AMF_H264_HEADER_INSERTION_SPACING_DESCRIPTION		TEXT_AMF_H264("HeaderInsertionSpacing.Description")
+//#define AMF_H264_SLICESPERFRAME								TEXT_AMF_H264("SlicesPerFrame")
+//#define AMF_H264_SLICESPERFRAME_DESCRIPTION					TEXT_AMF_H264("SlicesPerFrame.Description")
+//#define AMF_H264_SLICEMODE									TEXT_AMF_H264("SliceMode")
+//#define AMF_H264_SLICEMODE_DESCRIPTION						TEXT_AMF_H264("SliceMode.Description")
+//#define AMF_H264_MAXIMUMSLICESIZE							TEXT_AMF_H264("MaximumSliceSize")
+//#define AMF_H264_MAXIMUMSLICESIZE_DESCRIPTION				TEXT_AMF_H264("MaximumSliceSize.Description")
+//#define AMF_H264_SLICECONTROLMODE							TEXT_AMF_H264("SliceControlMode")
+//#define AMF_H264_SLICECONTROLMODE_DESCRIPTION				TEXT_AMF_H264("SliceControlMode.Description")
+//#define AMF_H264_SLICECONTROLSIZE							TEXT_AMF_H264("SliceControlSize")
+//#define AMF_H264_SLICECONTROLSIZE_DESCRIPTION				TEXT_AMF_H264("SliceControlSize.Description")
+//#define AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES				TEXT_AMF_H264("IntraRefresh.NumberOfStripes")
+//#define AMF_H264_INTRAREFRESH_NUMBEROFSTRIPES_DESCRIPTION	TEXT_AMF_H264("IntraRefresh.NumberOfStripes.Description")
+//#define AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT			TEXT_AMF_H264("IntraRefresh.MacroblocksPerSlot")
+//#define AMF_H264_INTRAREFRESH_MACROBLOCKSPERSLOT_DESCRIPTION	TEXT_AMF_H264("IntraRefresh.MacroblocksPerSlot.Description")

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Include/utility.h Added

@@ -0,0 +1,155 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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
+#include "amf.h"
+#include "amf-encoder.h"
+#include "components/VideoConverter.h"
+#ifdef WITH_AVC
+#include "amf-encoder-h264.h"
+#include "components/VideoEncoderVCE.h"
+#endif
+#ifdef WITH_HEVC
+#include "amf-encoder-h265.h"
+#include "components/VideoEncoderHEVC.h"
+#endif
+
+namespace Utility {
+	uint64_t GetUniqueIdentifier();
+	const char *obs_module_text_multi(const char *val, uint8_t depth = (uint8_t)1);
+
+	// Codec
+	const char* CodecToString(Plugin::AMD::Codec v);
+	const wchar_t* CodecToAMF(Plugin::AMD::Codec v);
+
+	// Color Format
+	const char* ColorFormatToString(Plugin::AMD::ColorFormat v);
+	amf::AMF_SURFACE_FORMAT ColorFormatToAMF(Plugin::AMD::ColorFormat v);
+
+	// Color Space
+	const char* ColorSpaceToString(Plugin::AMD::ColorSpace v);
+	AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM ColorSpaceToAMFConverter(Plugin::AMD::ColorSpace v);
+
+	// Usage
+	const char* UsageToString(Plugin::AMD::Usage v);
+	#ifdef WITH_AVC
+	AMF_VIDEO_ENCODER_USAGE_ENUM UsageToAMFH264(Plugin::AMD::Usage v);
+	Plugin::AMD::Usage UsageFromAMFH264(AMF_VIDEO_ENCODER_USAGE_ENUM v);
+	#endif
+	#ifdef WITH_HEVC
+	AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM UsageToAMFH265(Plugin::AMD::Usage v);
+	Plugin::AMD::Usage UsageFromAMFH265(AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM v);
+	#endif
+
+	// Quality Preset
+	const char* QualityPresetToString(Plugin::AMD::QualityPreset v);
+	#ifdef WITH_AVC
+	AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM QualityPresetToAMFH264(Plugin::AMD::QualityPreset v);
+	Plugin::AMD::QualityPreset QualityPresetFromAMFH264(AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM v);
+	#endif
+	#ifdef WITH_HEVC
+	AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM QualityPresetToAMFH265(Plugin::AMD::QualityPreset v);
+	Plugin::AMD::QualityPreset QualityPresetFromAMFH265(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM v);
+	#endif
+
+	// Profile
+	const char* ProfileToString(Plugin::AMD::Profile v);
+	#ifdef WITH_AVC
+	AMF_VIDEO_ENCODER_PROFILE_ENUM ProfileToAMFH264(Plugin::AMD::Profile v);
+	Plugin::AMD::Profile ProfileFromAMFH264(AMF_VIDEO_ENCODER_PROFILE_ENUM v);
+	#endif
+	#ifdef WITH_HEVC
+	AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM ProfileToAMFH265(Plugin::AMD::Profile v);
+	Plugin::AMD::Profile ProfileFromAMFH265(AMF_VIDEO_ENCODER_HEVC_PROFILE_ENUM v);
+	#endif
+
+	// Tier
+	#ifdef WITH_HEVC
+	const char* TierToString(Plugin::AMD::H265::Tier v);
+	AMF_VIDEO_ENCODER_HEVC_TIER_ENUM TierToAMFH265(Plugin::AMD::H265::Tier v);
+	Plugin::AMD::H265::Tier TierFromAMFH265(AMF_VIDEO_ENCODER_HEVC_TIER_ENUM v);
+	#endif
+
+	// Coding Type
+	const char* CodingTypeToString(Plugin::AMD::CodingType v);
+	#ifdef WITH_AVC
+	AMF_VIDEO_ENCODER_CODING_ENUM CodingTypeToAMFH264(Plugin::AMD::CodingType v);
+	Plugin::AMD::CodingType CodingTypeFromAMFH264(AMF_VIDEO_ENCODER_CODING_ENUM v);
+	#endif
+	#ifdef WITH_HEVC
+	int64_t CodingTypeToAMFH265(Plugin::AMD::CodingType v);
+	Plugin::AMD::CodingType CodingTypeFromAMFH265(int64_t v);
+	#endif
+
+	// Rate Control Method
+	const char* RateControlMethodToString(Plugin::AMD::RateControlMethod v);
+	#ifdef WITH_AVC
+	AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM RateControlMethodToAMFH264(Plugin::AMD::RateControlMethod v);
+	Plugin::AMD::RateControlMethod RateControlMethodFromAMFH264(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM v);
+	#endif
+	#ifdef WITH_HEVC
+	AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM RateControlMethodToAMFH265(Plugin::AMD::RateControlMethod v);
+	Plugin::AMD::RateControlMethod RateControlMethodFromAMFH265(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM v);
+	#endif
+
+	// Pre-Pass Method
+	const char* PrePassModeToString(Plugin::AMD::PrePassMode v);
+	#ifdef WITH_AVC
+	AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM PrePassModeToAMFH264(Plugin::AMD::PrePassMode v);
+	Plugin::AMD::PrePassMode PrePassModeFromAMFH264(AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM v);
+	#endif
+
+	// GOP Type
+	#ifdef WITH_HEVC
+	const char* GOPTypeToString(Plugin::AMD::H265::GOPType v);
+	Plugin::AMD::H265::GOPType GOPTypeFromAMFH265(int64_t v);
+	int64_t GOPTypeToAMFH265(Plugin::AMD::H265::GOPType v);
+	#endif
+
+	// Slicing
+	#ifdef WITH_AVC
+	const char* SliceModeToString(Plugin::AMD::H264::SliceMode v);
+	#endif
+	const char* SliceControlModeToString(Plugin::AMD::SliceControlMode v);
+
+	#ifdef WITH_AVC
+	Plugin::AMD::ProfileLevel H264ProfileLevel(std::pair<uint32_t, uint32_t> resolution, std::pair<uint32_t, uint32_t> frameRate);
+	#endif
+	#ifdef WITH_HEVC
+	Plugin::AMD::ProfileLevel H265ProfileLevel(std::pair<uint32_t, uint32_t> resolution, std::pair<uint32_t, uint32_t> frameRate);
+	#endif
+
+	//////////////////////////////////////////////////////////////////////////
+	// Threading Specific
+	//////////////////////////////////////////////////////////////////////////
+
+	#if (defined _WIN32) || (defined _WIN64)
+	void SetThreadName(uint32_t dwThreadID, const char* threadName);
+	void SetThreadName(const char* threadName);
+	void SetThreadName(std::thread* pthread, const char* threadName);
+	#else
+	void SetThreadName(std::thread* pthread, const char* threadName);
+	void SetThreadName(const char* threadName);
+	#endif
+}
\ No newline at end of file

obs-studio-18.0.1.tar.xz/plugins/enc-amf/LICENSE -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/LICENSE Changed

obs-studio-18.0.1.tar.xz/plugins/enc-amf/README.md -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/README.md Changed

@@ -1,112 +1,16 @@
-This is a plugin for OBS Studio that enables almost fully native hardware encoding instead of passing things off to Media Foundation Transform which is known to have issues with some certain settings. The plugin is based on the new AMF SDK and thus will work with any future driver releases.
+# What is this?
+This is a plugin for the [Open Broadcaster Software](https://obsproject.com/) project that adds support for AMD Hardware Encoding through the use of [AMDs Advanced Media Framework](https://github.com/GPUOpen-LibrariesAndSDKs/AMF).
 
-[Read More on the Wiki](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/wiki)
+Starting with Open Broadcaster Studio Version 0.16.2, this Plugin replaced the old Media Foundation Transform based approach (which causes issues and slowness). Due to this, Open Broadcaster Software Studio is now a better choice than the old Open Broadcaster Software Classic VCE branch.
 
-## Contributing
+## Requirements
+The plugin requires that you have a supported AMD GPU and have the following installed and updated to the latest version:
 
-Read [CONTRIBUTING.md](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/CONTRIBUTING.md) for a guide on how to start.
+* [Visual Studio 2015 Redistributables](https://www.microsoft.com/en-us/download/details.aspx?id=48145)
+* [AMD Graphics Driver](https://support.amd.com/en-us/download)
+* [Open Broadcaster Software Studio](https://obsproject.com/download#mp)
+* [AMD Advanced Media Framework Plugin](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/tags)
 
-# Contributors
-These people have helped (in one way or another) making this project possible. Without them, this project would have most likely not been where it is.
+# Read More
 
-| Who | What |
-| --- | ---- |
-| [Jim](https://github.com/jp9000) | Origin of the Open Broadcaster Software, provided support for development questions. |
-| [jackun](http://github.com/jackun) | The awesome person that started it all with his own Classic and Studio fork.<br>Thanks to him this project even exists today. |
-| [Xaymar](http://github.com/Xaymar) | Just the guy who spent a week staring at his monitors, trying to figure out how to make it work. |
-| GolDAce | CrowdIn integration. |
-| [leporel](https://github.com/leporel) | Provided ru-RU language files (Russian) |
-| [max20091](https://github.com/max20091) | Provided vi-VN language files (Vietnamese) |
-| [M4RK22](https://github.com/M4RK22) | Provided es-ES language files (Spanish) |
-| [niteforce](https://github.com/niteforce) | Provided hu-HU language files (Hungarian) |
-| [nwgat](https://github.com/nwgat) | Provided nb-NO language files (Norwegian) |
-| [wazerstar](https://github.com/wazerstar) | Provided da-DK language files (Danish) |
-| AMD | Providing Media SDK and later providing the AMF SDK. Also for incredibly fast fixing of bugs. |
-
-## The Amazing Supporters
-Special thanks go out to those that have either donated to the project directly or have decided to put some of their spare money into [my Patreon](https://patreon.com/xaymar). You guys rock!
-
-**[Jim](https://github.com/jp9000)**  
-Basically created the entire OBS project, without him it wouldn't even be here.
-
-**Kytos/M4RK22** 
-Im happy to support a nice recording plugin for AMD users.  
-Patron: 2016 August-November  
-[Website](https://markitos.ovh), [Steam](http://steamcommunity.com/id/markitos22/)  
-
-**nwgat.ninja**   
-nwgat.ninja is proud to support Xaymars Technology Projects.  
-Patron: 2016 August-November  
-[Website](https://nwgat.ninja)
-
-**Mattheus Wiegand**  
-Patron: 2016 August, September  
-[Twitter](https://twitter.com/Morphy2k/), [GitHub](https://github.com/Morphy2k)  
-
-**Jeremy "razorlikes" Nieth**   
-I like to support this project because it gives me a way to stream without having to sacrifice immense amounts of cpu resources for encoding.  
-Patron: 2016 August-November  
-[Twitch](https://twitch.tv/razorlikes), [GitHub](https://github.com/razorlikes)
-
-**Kristian Kirkesæther**   
-Patron: 2016 September-November
-
-**vektorDex**   
-Patron: 2016 September-November  
-[Website](http://blog-of-dex.de/), [Twitter](https://twitter.com/vektordex), [Studio](http://digitaldawnstudios.com)
-
-**AJ**   
-Patron: 2016 September-November
-
-**SneakyJoe**   
-Russian streamer and stream teacher, AMD fanboy. Wants to make AMD great again.  
-Patron: 2016 September-November  
-[Website](http://sneakyjoe.ru/), [YouTube](https://www.youtube.com/channel/UCUmRv5GwQcsnxXRzuPCGr-Q)
-
-**Nicholas Kreimeyer**   
-Patron: 2016 October, November
-
-**noext**   
-Patron: 2016 October
-
-**John Difool**   
-John Difool der alte Sack  
-Patron: 2016 October, November  
-[YouTube](https://www.youtube.com/channel/UC5FPsFLQh4ah0-vz-eoZlOA)
-
-**DaOrgest**  
-Currently studying computer and I do YouTube for a hobby  
-Patron: 2016 September-November  
-[Website](http://daorgest.me), [YouTube](http://youtube.com/daorgest)
-
-**Nucu**   
-Thanks AMD and Xaymar to make hardware encoding possible.  
-Patron: 2016 August-November
-
-**Daniel Bagge**   
-Patron: 2016 September-November
-
-**Cihangir Ceviren**   
-Patron: 2016 November
-
-# 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.
\ No newline at end of file
+You can [read more about it on the Wiki](https://github.com/Xaymar/obs-studio_amf-encoder-plugin/wikis/home)!
\ No newline at end of file

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/ca-ES.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/ca-ES.ini Changed

@@ -1,90 +1,135 @@
-AMF.Util.Default="Per defecte"
-AMF.Util.Automatic="Automàtic"
-AMF.Util.Manual="Manual"
-AMF.Util.Toggle.Disabled="Desactivat"
-AMF.Util.Toggle.Enabled="Activat"
-AMF.H264.Preset="Configuració preestablerta"
-AMF.H264.Preset.ResetToDefaults="Restableix als valors per defecte"
-AMF.H264.Preset.Recording="S'està enregistrant"
-AMF.H264.Preset.HighQuality="Alta qualitat"
-AMF.H264.Preset.Indistinguishable="Indistinguible"
-AMF.H264.Preset.Lossless="Sense pèrdues"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Ús"
-AMF.H264.Usage.Description="Quin ús s'ha d'ajustar AMF:\n- 'Codificació' és per a ús generalitzat (recomanat),\n- 'Latència Ultra Baixa' és per a una codificació de molt baixa latència,\n- 'Latència Baixa' és similar a l'anterior amb alguna cosa mes de latència.\nLes retransmissions en directe només suporten 'Codificació', tots els valors poden ser utilitzats per a enregistrar."
-AMF.H264.Usage.Transcoding="Transcodificació"
-AMF.H264.Usage.UltraLowLatency="Latència ultra baixa"
-AMF.H264.Usage.LowLatency="Latència baixa"
-AMF.H264.QualityPreset="Qualitat del perfil"
-AMF.H264.QualityPreset.Description="Quina qualitat del perfil d'AMD s'ha d'intentar aconseguir:\n- 'Velocitat' és la més ràpida però la que pitjor qualitat obté,\n- 'Equilibrat' està entre 'Velocitat' i 'Qualitat' oferint un balanç entre els dos,\n- 'Qualitat' ofereix la millor qualitat possible per una determinada tassa de marcs."
-AMF.H264.QualityPreset.Speed="Velocitat"
-AMF.H264.QualityPreset.Balanced="Equilibrat"
-AMF.H264.QualityPreset.Quality="Qualitat"
-AMF.H264.Profile="Perfil"
-AMF.H264.Profile.Description="Quin perfil H.264 s'ha d'utilitzar per la codificació, ordenats de major qualitat al més suportat."
-AMF.H264.ProfileLevel="Nivell de perfil"
-AMF.H264.ProfileLevel.Description="Nivell de perfil H.264 a utilitzar per la codificació:\n- 'Automàtic' calcula el millor nivell de perfil per certa velocitat i mida de marcs,\n- '4.1' suporta 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' suporta 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' suporta 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' suporta 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' suporta 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Mètode de control del flux"
-AMF.H264.RateControlMethod.Description="Quin mètode de control de flux s'ha d'utilitzar:\n- '\@AMF.H264.RateControlMethod.CQP\@' assigna valors fixos de QP a I-/P-/B-Frames (Paràmetre de quantització),\n- '\@AMF.H264.RateControlMethod.CBR\@' es manté en la tassa de marcs objectiu (utilitzant dades de farciment) (recomanat per transmissions en directe),\n- '\@AMF.H264.RateControlMethod.VBR\@' es manté per sota d'un pic de tassa de marcs,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' es manté prop de la tassa de marcs desitjada si la latència i carrega de la GPU ho permet, si no s'augmentarà la taxa de marcs (recomanat per a enregistraments)."
-AMF.H264.RateControlMethod.CQP="QP constant (CQP)"
-AMF.H264.RateControlMethod.CBR="Flux constant (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Flux variable (pic restringit)(VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Flux variable (latència restringida) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Tassa de bits desitjada"
-AMF.H264.Bitrate.Target.Description="Tassa de marcs a intentar arribar a la seqüència general."
-AMF.H264.Bitrate.Peak="Pic de tassa de bits"
-AMF.H264.Bitrate.Peak.Description="Tassa de marcs a intentar aconseguir com pic màxim en la seqüència general."
-AMF.H264.QP.Minimum="QP mínim"
-AMF.H264.QP.Minimum.Description="Valor mínim de QP (paràmetre de quantització) a utilitzar en un fotograma."
-AMF.H264.QP.Maximum="QP màxim"
-AMF.H264.QP.Maximum.Description="Valor màxim de QP (paràmetre de quantització) a utilitzar en un fotograma."
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.IFrame.Description="Valor fix de QP per I-Frames."
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.PFrame.Description="Valor fix de QP per P-Frames."
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.QP.BFrame.Description="Valor de QP fix (paràmetre de quantització) a utilitzar per B-Frames."
-AMF.H264.VBVBuffer="Memòria intermèdia VBV"
-AMF.H264.VBVBuffer.Description="Quin mètode s'ha d'utilitzar per determinar la mida de la memòria intermèdia VBV:\n- 'Automàtic' calcula la mida utilitzant una restricció estricta,\n- 'Manual' permet a l'usuari controlar la mida.\nLa memòria intermèdia VBV (Verificador de la memòria intermèdia del vídeo) és usat per certs mètodes de control del flux per mantenir la taxa de bits dins dels paràmetres establerts."
-AMF.H264.VBVBuffer.Strictness="Rigorositat de la memòria intermèdia VBV"
-AMF.H264.VBVBuffer.Strictness.Description="Determina la rigidesa de la memòria intermèdia VBV, con 100% essent tant estricte com sigui possible i 0% sense restricció."
-AMF.H264.VBVBuffer.Size="Mida de la memòria intermèdia VBV"
-AMF.H264.VBVBuffer.Size.Description="La mida de la memòria intermèdia VBV que s'utilitza per al control de la tassa de marcs en una seqüencia."
-AMF.H264.VBVBuffer.Fullness="Amplitud de la memòria intermèdia VBV"
-AMF.H264.VBVBuffer.Fullness.Description="Com de ple és la memòria intermèdia VMV inicialment, només afectarà la seqüència inicial de la codificació."
-AMF.H264.FillerData="Dades a omplir"
-AMF.H264.FillerData.Description="En activar les dades de farciment es permet al codificador mantenir almenys la tassa de marcs desitjada omplint l'espai que falta amb informació sense valor."
-AMF.H264.FrameSkipping="Omissió de fotogrames"
-AMF.H264.FrameSkipping.Description="L'omissió de fotogrames permet al codificador saltar fotogrames per complir amb el requeriment de la tassa de marcs objectiu.\nQuan el codificador salta un fotograma inserirà una NAL que repetirà el darrer fotograma codificat a la transmissió.\nPot ajudar amb tassa de bits objectiu molt baixes."
-AMF.H264.EnforceHRDCompatibility="Força la compatibilitat amb HRD"
-AMF.H264.EnforceHRDCompatibility.Description="Força les restriccions del descodificador hipotètic de referència que limiten el canvi de valor màxim de QP dins d'un fotograma."
-AMF.H264.KeyframeInterval="Interval de fotogrames clau"
-AMF.H264.KeyframeInterval.Description="Quants segons han d'haver entre fotogrames que no es poden descartar.\nTambé controla la mida de la seqüència (GOP)."
-AMF.H264.IDRPeriod="Període IDR"
-AMF.H264.IDRPeriod.Description="Defineix la distància entre Instantaneous Decoding Refreshes (IDR) en fotogrames. També controla la mida de la seqüència del GOP."
-AMF.H264.BFrame.Pattern="B-Frames"
-AMF.H264.BFrame.Pattern.Description="La quantitat de B-Frames a utilitzar mestre es codifica.\nCompatible amb targetes de 2ª i 3ª generació VCE. Impacte negatiu en el rendiment de codificació."
-AMF.H264.BFrame.DeltaQP="Delta QP per B-Frames"
-AMF.H264.BFrame.DeltaQP.Description="Valor Delta QP per al darrer I- o P-Frame per B-Frames no referenciables."
-AMF.H264.BFrame.Reference="B-Frames referenciables"
-AMF.H264.BFrame.Reference.Description="Permet a un B-Frames utilitzar també B-Frames com referència, enlloc de P- i I-Frames."
-AMF.H264.BFrame.ReferenceDeltaQP="Delta QP per als fotogrames referenciables"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Valor Delta QP per al darrer I- o P-Frame per B-Frames referenciables."
-AMF.H264.DeblockingFilter="Filtre d'eliminació de blocs"
-AMF.H264.DeblockingFilter.Description="Estableix l'indicador que el descodificador està permès a utilitzar el Filtre d'eliminació de blocs per a la transmissió codificada."
-AMF.H264.ScanType="Tipus d'exploració"
-AMF.H264.ScanType.Description="Quin mètode de escaneig utilitzar, deixeu-lo sempre a '\@AMF.H264.ScanType.Progressive\@'."
-AMF.H264.ScanType.Progressive="Progressiu"
-AMF.H264.ScanType.Interlaced="Entrellaçat"
-AMF.H264.MotionEstimation="Estimació del moviment"
-AMF.H264.MotionEstimation.Description="L'estimació del moviment permet al codificador reduir el flux de dades necessari calculant d'on vénen els píxels."
-AMF.H264.MotionEstimation.None="Cap"
-AMF.H264.MotionEstimation.Half="Meitat de píxel"
-AMF.H264.MotionEstimation.Quarter="Quart de Píxel"
-AMF.H264.MotionEstimation.Both="Meitat i quart de píxel"
-AMF.H264.CodingType="Tipus de codificació"
-AMF.H264.CodingType.Description="Quin tipus de codificació utilitzar:\n* \@AMF.Util.Default\@ deixeu que AMF ho decideixi (recomanat).\n* CALVC (Context-Adaptive Variable-Length Coding) és més ràpid, però mes gran.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) es més lent, però més petit."
+Utility.Default="Per defecte"
+Utility.Automatic="Automàtic"
+Utility.Manual="Manual"
+Utility.Switch.Disabled="Desactivat"
+Utility.Switch.Enabled="Activat"
+Preset="Configuració preestablerta"
+Preset.ResetToDefaults="Restableix als valors per defecte"
+Preset.Recording="S'està enregistrant"
+Preset.HighQuality="Alta qualitat"
+Preset.Indistinguishable="Indistinguible"
+Preset.Lossless="Sense pèrdues"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Ús"
+Usage.Description="Quin ús s'ha d'ajustar AMF:\n- '\@Usage.Transcoding\@' és per a un ús generalitzat (recomanat),\n- '\@Usage.UltraLowLatency\@' és per a una codificació de molt baixa latència,\n- '\@Usage.LowLatency\@' és similar a l'anterior però amb una mica més de latència.\nLes emissions en directe només suporten '\@Usage.Transcoding\@', tots els valors poden ser usats per gravar."
+Usage.Transcoding="Transcodificació"
+Usage.UltraLowLatency="Latència ultra baixa"
+Usage.LowLatency="Latència baixa"
+Usage.Webcam="Càmera web"
+QualityPreset="Qualitat del perfil"
+QualityPreset.Description="Quina qualitat del perfil AMF s'ha d'intentar aconseguir:\n- '\@QualityPreset.Speed\@' és el més ràpid però té la pitjor qualitat, \n-'\@QualityPreset.Balanced\@' és una barreja equilibrada de tots dos,\n- '\@QualityPreset.Quality\@' dóna la millor qualitat per a un determinada taxa de bits."
+QualityPreset.Speed="Velocitat"
+QualityPreset.Balanced="Equilibrat"
+QualityPreset.Quality="Qualitat"
+Profile="Perfil"
+Profile.Description="Quin perfil s'ha d'utilitzar per a la codificació, ordenats des de el suport més estès a la més alta qualitat."
+ProfileLevel="Nivell de perfil"
+ProfileLevel.Description="Quin nivell de perfil s'ha d'utilitzar per a la codificació, el millor és deixar-ho això en \@Utility.Automatic\@"
+Tier="Nivell"
+Tier.Description="En quin nivell codificar, Main es la codificació normal, mentre que High s'enfoca en aplicacions d'alta velocitat de bits."
+AspectRatio="Relació d'aspecte"
+AspectRatio.Description="Quina relació d'aspecte s'ha d'escriure a l'arxiu de sortida."
+CodingType="Tipus de codificació"
+CodingType.Description="Quin tipus de codificació utilitzar:\n* '\@Utility.Automatic\@' deixeu que AMF ho decideixi (recomanat).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) és més ràpid, però més gran.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) és més lent, però més petit."
+MaximumReferenceFrames="Fotogrames de referència màxims"
+MaximumReferenceFrames.Description="Quants quadres el codificador pot fer referència al màxim quan codifica, té un impacte directe en la qualitat de codificació."
+RateControlMethod="Mètode de control del flux"
+RateControlMethod.Description="Quin mètode de control de flux s'ha d'utilitzar:\n- '\@RateControlMethod.CQP\@' assigna valors fixos de QP a I-/P-/B-Frames,\n- '\@RateControlMethod.CBR\@' es manté en la taxa de bits objectiu (utilitzant dades de farciment) (recomanat per a emissions en directe),\n- '\@RateControlMethod.VBR\@' es manté per sota d'un pic de taxa de bits,\n- '\@RateControlMethod.VBRLAT\@' es manté prop de la taxa de bits desitjada si la latència i càrrega de la GPU ho permet, si no s'augmentarà la taxa de bits (recomanat per a enregistraments)."
+RateControlMethod.CQP="QP constant (CQP)"
+RateControlMethod.CBR="Flux constant (CBR)"
+RateControlMethod.VBR="Flux variable (pic restringit) (VBR)"
+RateControlMethod.VBRLAT="Flux variable (latència restringida) (VBR_LAT)"
+PrePassMode="Mode passada prèvia"
+PrePassMode.Description="La passada prèvia és una passada de distribució de taxa de bits secundària que permet una millor distribució de la taxa de bits dins d'una seqüència, però els efectes d'aquesta pot variar de targeta a targeta."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (1/4 de la mida)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (1/2 de la mida)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (mida completa)"
+Bitrate.Target="Tassa de bits desitjada"
+Bitrate.Target.Description="Tassa de bits a intentar arribar a la seqüència general."
+Bitrate.Peak="Pic de tassa de bits"
+Bitrate.Peak.Description="Tassa de bits a intentar aconseguir com a pic màxim en la seqüència general."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Valor fix de QP per I-Frames."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Valor fix de QP per P-Frames."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Valor fix de QP per B-Frames."
+QP.Minimum="QP mínim"
+QP.Minimum.Description="Valor QP mínim a utilitzar en un marc."
+QP.IFrame.Minimum="I-Frame QP mínim"
+QP.IFrame.Minimum.Description="Valor QP mínim a utilitzar en un I-Frame."
+QP.PFrame.Minimum="P-Frame QP mínim"
+QP.PFrame.Minimum.Description="Valor QP mínim a utilitzar en un P-Frame."
+QP.Maximum="QP màxim"
+QP.Maximum.Description="Valor QP màxim a utilitzar en un marc."
+QP.IFrame.Maximum="I-Frame QP màxim"
+QP.IFrame.Maximum.Description="Valor QP màxim a utilitzar en un I-Frame."
+QP.PFrame.Maximum="P-Frame QP màxim"
+QP.PFrame.Maximum.Description="Valor QP màxim a utilitzar en un P-Frame."
+FillerData="Dades de farciment"
+FillerData.Description="En activar les dades de farciment es permet al codificador mantenir almenys \@Bitrate.Target\@ omplint l'espai que falta amb informació sense valor."
+FrameSkipping="Omissió de fotogrames"
+FrameSkipping.Description="L'omissió de fotogrames permet al codificador saltar fotogrames per complir amb el requeriment de la\@Bitrate.Target\@.\nQuan el codificador salta un fotograma inserirà una NAL que repetirà l'últim fotograma codificat a la transmissió.\nPot ajudar amb \@Bitrate.Target\@ molt baixes."
+VBAQ="VBAQ"
+VBAQ.Description="En activar l'ús de 'Quantització adaptativa basada en la variació' (VBAQ) que es basa en la variació del pixel per a una millor distribució de la taxa de bits. \nFunciona amb la idea que el sistema visual humà és menys sensible als artefactes en àrees altament texturades i així mourà la tassa de bits cap a superfícies més suaus. \nEn activar-lo pot portar a millores en la qualitat subjectiva en cert contingut."
+EnforceHRD="Força l'HRD"
+EnforceHRD.Description="Força l'ús d'un descodificador de referència hipotètic que s'utilitza per verificar que el flux de marcs de sortida es correcte."
+VBVBuffer="Memòria intermèdia VBV"
+VBVBuffer.Description="Quin mètode s'ha d'utilitzar per determinar la mida de la memòria intermèdia VBV:\n- '\@Utlity.Automatic\@' calcula la mida utilitzant una restricció estricta,\n- '\@Utlity.Manual\@' permet a l'usuari controlar la mida.\nLa memòria intermèdia VBV (Verificador de la memòria intermèdia del vídeo) és usat per certs mètodes de control del flux per mantenir la taxa de bits dins dels paràmetres establerts."
+VBVBuffer.Strictness="Rigorositat de la memòria intermèdia VBV"
+VBVBuffer.Strictness.Description="Determina la rigidesa de la memòria intermèdia VBV, con 100% essent tant estricte com sigui possible i 0% sense restricció."
+VBVBuffer.Size="Mida de la memòria intermèdia VBV"
+VBVBuffer.Size.Description="La mida de la memòria intermèdia VBV que s'utilitza per al control de la tassa de marcs en una seqüencia."
+VBVBuffer.InitialFullness="Amplitud inicial de la memòria intermèdia VBV"
+VBVBuffer.InitialFullness.Description="Com de ple és la memòria intermèdia VMV inicialment (en %), només afectarà la seqüència inicial de la codificació."
+KeyframeInterval="Interval de fotogrames clau"
+KeyframeInterval.Description="Interval (en segons) entre fotogrames clau."
+H264.IDRPeriod="Període IDR (en marcs)"
+H264.IDRPeriod.Description="Defineix la distància entre Instantaneous Decoding Refreshes (IDR) en fotogrames. També controla la mida de la seqüència del GOP."
+H265.IDRPeriod="Període IDR (en GOPs)"
+H265.IDRPeriod.Description="Defineix la distància entre actualitzacions de descodificació instantània (IDR) en GOPs."
+GOP.Type="Tipus de GOP"
+GOP.Type.Description="Quin tipus de GOP s'ha d'utilitzar: \n - ' \@GOP. Type.Fixed\@' utilitzarà sempre distàncies fixes entre cada GOP. \n - ' \@GOP. Type.Variable\@' permet GOPs de diferents mides, depenent del que es necessiti.\n'\@GOP. Type.Fixed\@' és com els treballs d'implementació H264 i el millor per a les transmissions de xarxa local, mentre que ' \@GOP. Type.Variable\@' és el millor per a enregistraments d'alta qualitat i de baix grandària."
+GOP.Type.Fixed="Fix"
+GOP.Type.Variable="Variable"
+GOP.Size="Mida del GOP"
+GOP.Size.Description="Mida del GOP (grup d'imatges) en marcs."
+GOP.Size.Minimum="Mida mínima del GOP"
+GOP.Size.Minimum.Description="Mida mínima del GOP (grup d'imatges) en marcs."
+GOP.Size.Maximum="Mida màxima del GOP"
+GOP.Size.Maximum.Description="Mida màxima del GOP (grup d'imatges) en marcs."
+GOP.Alignment="Alineació del GOP"
+GOP.Alignment.Description="Experimental, els efectes són desconeguts. Utilitzeu-lo sota la vostra responsabilitat."
+BFrame.Pattern="Patró B-Frame"
+BFrame.Pattern.Description="La quantitat de B-Frames a utilitzar mestre es codifica.\nCompatible amb targetes de 2ª i 3ª generació VCE. Impacte negatiu en el rendiment de codificació."
+BFrame.DeltaQP="B-Frame Delta QP"
+BFrame.DeltaQP.Description="Valor Delta QP per al darrer I- o P-Frame per B-Frames no referenciables."
+BFrame.Reference="Referència B-Frame"
+BFrame.Reference.Description="Permet a un B-Frames utilitzar també B-Frames com referència, enlloc de P- i I-Frames."
+BFrame.ReferenceDeltaQP="Referència B-Frame Delta QP"
+BFrame.ReferenceDeltaQP.Description="Valor Delta QP per al darrer I- o P-Frame per B-Frames referenciables."
+DeblockingFilter="Filtre d'eliminació de blocs"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/cs-CZ.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/cs-CZ.ini Changed

@@ -1,72 +1,20 @@
-AMF.Util.Default="Výchozí"
-AMF.Util.Automatic="Automatické"
-AMF.Util.Manual="Manuální"
-AMF.Util.Toggle.Disabled="Zakázáno"
-AMF.Util.Toggle.Enabled="Povoleno"
-AMF.H264.Preset="Profil"
-AMF.H264.Preset.ResetToDefaults="Obnovit výchozí"
-AMF.H264.Preset.Recording="Nahrávání"
-AMF.H264.Preset.HighQuality="Vysoká kvalita"
-AMF.H264.Preset.Indistinguishable="Nerozeznatelné"
-AMF.H264.Preset.Lossless="Lossless"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Využití"
-AMF.H264.Usage.Transcoding="Kódování"
-AMF.H264.Usage.UltraLowLatency="Ultra nízká odezva"
-AMF.H264.Usage.LowLatency="Nízká odezva"
-AMF.H264.QualityPreset="Profil kvality"
-AMF.H264.QualityPreset.Speed="Rychlost"
-AMF.H264.QualityPreset.Balanced="Vyváženo"
-AMF.H264.QualityPreset.Quality="Kvalita"
-AMF.H264.Profile="Profil"
-AMF.H264.ProfileLevel="Úroveň profilu"
-AMF.H264.RateControlMethod="Metoda řízení"
-AMF.H264.RateControlMethod.CQP="Konstantní QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Konstantní bitrate (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Proměnný bitrate (vázán špičkou) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Proměnný bitrate (vázán odezvou) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Cílový bitrate"
-AMF.H264.Bitrate.Target.Description="Bitrate, kterého se máme snažit dosáhnout v celé sekvenci."
-AMF.H264.Bitrate.Peak="Špičkový bitrate"
-AMF.H264.Bitrate.Peak.Description="Bitrate, kterého se máme snažit nepřekročit v celé sekvenci."
-AMF.H264.QP.Minimum="Minimální QP"
-AMF.H264.QP.Maximum="Maximální QP"
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.IFrame.Description="Pevná hodnota QP používaná pro I-Frames."
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.PFrame.Description="Pevná hodnota QP používaná pro P-Frames."
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.QP.BFrame.Description="Pevná hodnota QP používaná pro B-Frames."
-AMF.H264.VBVBuffer="VBV Buffer"
-AMF.H264.FillerData="Filtrovat data"
-AMF.H264.FrameSkipping="Přeskakování snímků"
-AMF.H264.EnforceHRDCompatibility="Vynutit kompatibilitu s HRD"
-AMF.H264.KeyframeInterval="Interval klíčový snímků"
-AMF.H264.KeyframeInterval.Description="Kolik vteřin by mělo být mezi ne-zahazovatelnými snímky.\nTaké ovládá velikost sekvence(GOP)."
-AMF.H264.ScanType="Typ skenování"
-AMF.H264.ScanType.Description="Určuje použitou metodu skenování, vždy ponechejte na 'Progresivní'."
-AMF.H264.ScanType.Progressive="Progresivní"
-AMF.H264.ScanType.Interlaced="Prokládané"
-AMF.H264.MotionEstimation="Odhad pohybu"
-AMF.H264.MotionEstimation.Description="Odhad pohybu umožňuje enkodéru snížit požadovaný bitrate předpovídáním, kam se určitý pixel posunul."
-AMF.H264.MotionEstimation.None="Žádný"
-AMF.H264.MotionEstimation.Half="Polovina pixelu"
-AMF.H264.MotionEstimation.Quarter="Čtvrtina pixelu"
-AMF.H264.MotionEstimation.Both="Polovina & čtvrtina pixelu"
+Utility.Default="Výchozí"
+Utility.Automatic="Automatické"
+Utility.Manual="Manuální"
+Utility.Switch.Disabled="Zakázáno"
+Utility.Switch.Enabled="Povoleno"
+Preset="Profil"
+Preset.ResetToDefaults="Obnovit výchozí"
+Preset.Recording="Nahrávání"
+Preset.HighQuality="Vysoká kvalita"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Využití"
+Usage.UltraLowLatency="Ultra nízká odezva"
+Usage.Webcam="Webkamera"
+QualityPreset.Balanced="Vyvážený"
+QualityPreset.Quality="Kvalita"
+Profile="Profil"
+ProfileLevel="Úroveň profilu"
 AMF.H264.MaximumLTRFrames="Maximální počet LTR snímků"
-AMF.H264.VideoAPI="Grafické rozhraní (API)"
-AMF.H264.VideoAPI.Description="Které rozhraní má být použito pro kódování."
-AMF.H264.VideoAdapter="Grafický adaptér"
-AMF.H264.VideoAdapter.Description="Adaptér, který má být použit pro kódování."
-AMF.H264.OpenCL="OpenCL"
-AMF.H264.OpenCL.Description="Má být použit OpenCL pro vkládání jednotlivých snímků?"
-AMF.H264.View="Režim zobrazení"
-AMF.H264.View.Description="Které možnosti mají být zobrazeny. Nezískáte žádnou pomoc při použití módu 'Expert' či 'Master'."
-AMF.H264.View.Basic="Základní"
-AMF.H264.View.Advanced="Pokročilý"
-AMF.H264.View.Expert="Expert"
-AMF.H264.View.Master="Master"
-AMF.H264.Debug="Ladění"
-AMF.H264.Debug.Description="Zapne rozšířené protokolování, mělo by být zapnuto, pokud pořebujete pomoci s tmto enkodérem."

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/da-DK.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/da-DK.ini Changed

@@ -1,46 +1,24 @@
-AMF.Util.Default="Standard"
-AMF.Util.Automatic="Automatisk"
-AMF.Util.Manual="Manuelt"
-AMF.Util.Toggle.Disabled="Deaktiveret"
-AMF.Util.Toggle.Enabled="Aktiveret"
-AMF.H264.Preset="Forudindstillinger"
-AMF.H264.Preset.ResetToDefaults="Nulstil til standarder"
-AMF.H264.Preset.Recording="Optagelse"
-AMF.H264.Preset.HighQuality="Højkvalitet"
-AMF.H264.Preset.Indistinguishable="Indistingverbar"
-AMF.H264.Preset.Lossless="Tabsfri"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Anvendelse"
-AMF.H264.Usage.Description="Hvilken anvendelse AMF bør indstilles til:\n- '\@AMF.H264.Usage.Transcoding\@' er omkodning til generelle formål (anbefalet),\n - '\@AMF.H264.Usage.UltraLowLatency\@' er til virkelig lav-forsinkelseskodning,\n- '\@AMF.H264.Usage.LowLatency\@' er tilsvarende ovennævnte med en lidt større forsinkelse.\nStreaming understøtter kun '\@AMF.H264.Usage.Transcoding\@', alle andre værdier kan benyttes til optagelse."
-AMF.H264.Usage.Transcoding="Transcoding"
-AMF.H264.Usage.UltraLowLatency="Ekstrem Lav Ventetid"
-AMF.H264.Usage.LowLatency="Lav Ventetid"
-AMF.H264.QualityPreset="Kvalitets profiler"
-AMF.H264.QualityPreset.Description="Hvilken Kvalitetsforudindstilling AMF bør forsøges målrettet imod:\n- '\@AMF. H264. QualityPreset.Speed\@' er den hurtigste, men har den ringeste kvalitet,\n- '\@AMF. H264. QualityPreset.Balanced\@' er en balanceret blanding af begge,\n- '\@AMF. H264. QualityPreset.Quality\@' giver den bedste kvalitet for en given bithastighed."
-AMF.H264.QualityPreset.Speed="Hastighed (Dårligste kvalitet)"
-AMF.H264.QualityPreset.Balanced="Balanceret (Mellem Kvalitet)"
-AMF.H264.QualityPreset.Quality="Kvalitet (Bedste Kvalitet)"
-AMF.H264.Profile="Profil"
-AMF.H264.Profile.Description="Hvilken H.264-profil at benytte til kodning, sorteret fra højeste kvalitet til mest udbredte understøttelse."
-AMF.H264.ProfileLevel="Profil Niveau"
-AMF.H264.ProfileLevel.Description="Hvilket H.264-profilniveau at benytte til kodning:\n- ' \@AMF. Util.Automatic\@' beregner det best profilniveau for en given billedhastighed og -størrelse,\n- '4.1' understøtter 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' understøtter 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' understøtter 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' understøtter 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' understøtter 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960 x 540 172 FPS"
-AMF.H264.RateControlMethod="Rate Control Method"
-AMF.H264.RateControlMethod.CQP="Constant QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Constant Bitrate (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Variable Bitrate (Peak Constrained) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Variable Bitrate (Latency Constrained) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Mål Bitrate"
-AMF.H264.Bitrate.Peak="Top Bitrate"
-AMF.H264.QP.Minimum="Minimum QP"
-AMF.H264.QP.Maximum="Maksimum QP"
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.FillerData="Filler Data"
-AMF.H264.FrameSkipping="Billede skip"
-AMF.H264.EnforceHRDCompatibility="Tving HRD Kompatibilitet"
-AMF.H264.DeblockingFilter="Deblocking Filter"
-AMF.H264.ScanType="Scan Type"
-AMF.H264.ScanType.Progressive="Progressive"
-AMF.H264.ScanType.Interlaced="Interlaced"
+Utility.Default="Standard"
+Utility.Automatic="Automatisk"
+Utility.Manual="Manuel"
+Utility.Switch.Disabled="Deaktiveret"
+Utility.Switch.Enabled="Aktiveret"
+Preset="Forudindstillinger"
+Preset.ResetToDefaults="Nulstil til standarder"
+Preset.Recording="Optagelse"
+Preset.HighQuality="Høj kvalitet"
+Preset.Indistinguishable="Ingen forskel"
+Preset.Lossless="Tabsfri"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Brug"
+Usage.Transcoding="Transcoding"
+Usage.UltraLowLatency="Ultra lav latenstid"
+Usage.LowLatency="Lav latenstid"
+Usage.Webcam="Webcam"
+QualityPreset="Kvalitets profiler"
+QualityPreset.Speed="Hastighed"
+QualityPreset.Balanced="Balanceret"
+QualityPreset.Quality="Kvalitet"
+Profile="Profil"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/de-DE.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/de-DE.ini Changed

@@ -1,91 +1,135 @@
-AMF.Util.Default="Standard"
-AMF.Util.Automatic="Automatisch"
-AMF.Util.Manual="Manuell"
-AMF.Util.Toggle.Disabled="Deaktiviert"
-AMF.Util.Toggle.Enabled="Aktiviert"
-AMF.H264.Preset="Voreinstellungen"
-AMF.H264.Preset.ResetToDefaults="Standardeinstellungen wiederherstellen"
-AMF.H264.Preset.Recording="Aufnahme"
-AMF.H264.Preset.HighQuality="Hohe Qualität"
-AMF.H264.Preset.Indistinguishable="Ununterscheidbar"
-AMF.H264.Preset.Lossless="Verlustfrei"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Nutzungsart"
-AMF.H264.Usage.Description="Auf welche Nutzungsart AMF eingestellt werden soll:\n- '\@AMF.H264.Usage.Transcoding\@' für generelle Codierung (empfohlen),\n- '\@AMF.H264.Usage.UltraLowLatency\@' für Codierung mit sehr niedriger Latenz,\n- '\@AMF.H264.Usage.LowLatency\@' ist ähnlich dem oberen mit leicht erhöhter Latenz.\nNur '\@AMF.H264.Usage.Transcoding\@' wird für das Streamen unterstützt, alle anderen können für Aufnahmen verwendet werden."
-AMF.H264.Usage.Transcoding="Umwandeln"
-AMF.H264.Usage.UltraLowLatency="Sehr Niedrige Latenz"
-AMF.H264.Usage.LowLatency="Niedrige Latenz"
-AMF.H264.QualityPreset="Qualitätsvoreinstellung"
-AMF.H264.QualityPreset.Description="Welche Qualitätsvoreinstellungen AMF versuchen soll zu verwenden:\n- '\@AMF.H264.QualityPreset.Speed\@' ist die schnellste aber hat die schlechteste Qualität,\n- '\@AMF.H264.QualityPreset.Balanced\@' ist ein balancierter Mix aus beiden,\n- '\@AMF.H264.QualityPreset.Quality\@' gibt die beste Qualität für eine gegebene Bitrate."
-AMF.H264.QualityPreset.Speed="Geschwindigkeit"
-AMF.H264.QualityPreset.Balanced="Ausgeglichen"
-AMF.H264.QualityPreset.Quality="Qualität"
-AMF.H264.Profile="Profil"
-AMF.H264.Profile.Description="Welches H.264 Profil soll für die Kodierung verwendet werden, sortiert von höchster Qualität bis am weitesten verbeiteten Unterstützung."
-AMF.H264.ProfileLevel="Profillevel"
-AMF.H264.ProfileLevel.Description="Welches H.264 Profil Level für das verarbeiten verwendet werden soll:\n- '\@AMF.Util.Automatic\@' errechnet das beste Profil Level für die gegebene Frame Rate und Frame Größe,\n- '4.1' unterstützt 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' unterstützt 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' unterstützt 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' unterstützt 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' unterstützt 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Ratenkontrollmethode"
-AMF.H264.RateControlMethod.Description="Welche Ratenkontrollmethode verwendet werden soll:\n- '\@AMF.H264.RateControlMethod.CQP\@' setzt feste QP (Quantifizierungsparameter) Werte für I-/P-/B- Bilder,\n- '\@AMF.H264.RateControlMethod.CBR\@' bleibt auf der Zielbitrate (mithilfe von Füllungsdaten) (empfohlen für das Streamen),\n- '\@AMF.H264.RateControlMethod.VBR\@' bleibt unter der Spitzenbitrate,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' bleibt nahe der Zielbitrate sofern GPU-Latenz und GPU-Benutzung dies erlauben, ansonsten wird eine höhere Bitrate verwendet (empfohlen für Aufnahmen)."
-AMF.H264.RateControlMethod.CQP="Konstante QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Konstante Bitrate (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Variable Bitrate (Eingeschränkt via Spitzenbitrate) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Variable Bitrate (Eingeschränkt via Latenz) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Zielbitrate"
-AMF.H264.Bitrate.Target.Description="Zielbitrate die in der ganzen Sequenz erreicht werden soll."
-AMF.H264.Bitrate.Peak="Spitzenbitrate"
-AMF.H264.Bitrate.Peak.Description="Spitzenbitrate die in der ganzen Sequenz erreicht werden darf."
-AMF.H264.QP.Minimum="Minimale QP"
-AMF.H264.QP.Minimum.Description="Niedrigster QP (Quantifizierungsparameter) wert der in einem Bild verwendet wird."
-AMF.H264.QP.Maximum="Maximale QP"
-AMF.H264.QP.Maximum.Description="Höchster QP (Quantifizierungsparameter) wert der in einem Bild verwendet wird."
-AMF.H264.QP.IFrame="I-Einzelbild QP"
-AMF.H264.QP.IFrame.Description="Fester QP wert der für I-Bilder verwendet wird."
-AMF.H264.QP.PFrame="P-Einzelbild QP"
-AMF.H264.QP.PFrame.Description="Fester QP wert der für P-Bilder verwendet wird."
-AMF.H264.QP.BFrame="B-Einzelbild QP"
-AMF.H264.QP.BFrame.Description="Fester QP wert der für B-Bilder verwendet wird."
-AMF.H264.VBVBuffer="VBV Buffer"
-AMF.H264.VBVBuffer.Description="Welche Methode genutzt werden soll um die VBV-Puffergröße zu bestimmen:\n- '\@AMF.Util.Automatic\@' errechnet diese mithilfe einer Strengeneinschränkung,\n- '\@AMF.Util.Manual\@' erlaubt es dem Nutzer die Größe zu kontrollieren.\n
-VBV (Videopufferungsverifizierer) Puffer wird von verschiedenen Ratenkontrollmethoden genutzt um die gesamte Bitrate innerhalb der Begrenzungen zu halten."
-AMF.H264.VBVBuffer.Strictness="VBV Buffer Genauigkeit"
-AMF.H264.VBVBuffer.Strictness.Description="Legt die Einschränkungsstärke des VBV Buffers fest, wobei 100% so eingeschränkt wie möglich ist und 0% komplett uneingeschränkt."
-AMF.H264.VBVBuffer.Size="VBV Buffer Größe"
-AMF.H264.VBVBuffer.Size.Description="Die Größe des VBV Buffers, welcher für die Bitratenkontrolle in einer Sequenz verwendet wird."
-AMF.H264.VBVBuffer.Fullness="VBV Buffer Füllung"
-AMF.H264.VBVBuffer.Fullness.Description="Wie voll der VBV Buffer anfangs ist, hat nur einen Effekt auf die erste Sequenz beim codieren."
-AMF.H264.FillerData="Füllungsdaten"
-AMF.H264.FillerData.Description="Das aktivieren von Füllungsdaten erlaubt es dem Codierer mindestens die Zielbitrate zu erreichen in dem dieser den verbleibenden Platz mit leeren Informationen füllt."
-AMF.H264.FrameSkipping="Bildüberspringung"
-AMF.H264.FrameSkipping.Description="Bildüberspringung erlaubt es dem Codierer, Bilder zu überspringen um die Zielbitrate einzuhalten.\nWenn der Codierer ein Bild überspringt, fügt dieser stattdessen ein repeat-last-frame NAL in den Stream ein.\nKann bei sehr niedrigen Zielbitraten helfen."
-AMF.H264.EnforceHRDCompatibility="Erzwinge HRD Kompatiblität"
-AMF.H264.EnforceHRDCompatibility.Description="Erzwinge Hypothetischer-Referenz-Decodierer Limitierungen welches die maximale Änderung des QP werts innerhalb eines Bildes begrenzt."
-AMF.H264.KeyframeInterval="Keyframeintervall"
-AMF.H264.KeyframeInterval.Description="Definiert die Distanz zwischen Keyframes in Sekunden. Setzt auch die Größe einer GOP-Sequenz fest."
-AMF.H264.IDRPeriod="IDR Zeitraum"
-AMF.H264.IDRPeriod.Description="Definiert die Distanz zwischen Sofortigen-Decodierer-Aktualisierungen (IDR) in Frames. Setzt auch die Größe einer GOP-Sequenz fest."
-AMF.H264.BFrame.Pattern="B-Bilder"
-AMF.H264.BFrame.Pattern.Description="Wie viele B-Bilder beim codieren verwendet werden sollen.\nWird von der 2ten und 3ten generation an VCE-Karten unterstützt. Negativer Einfluss auf Codierungsperformanz."
-AMF.H264.BFrame.DeltaQP="Delta QP für B-Bilder"
-AMF.H264.BFrame.DeltaQP.Description="Delta QP wert zum letzten I- or P-Bild für nicht referenzierbare B-Bilder."
-AMF.H264.BFrame.Reference="Referenzierbare B-Bilder"
-AMF.H264.BFrame.Reference.Description="Erlaube einem B-Bild andere B-Bilder als referenz zu verwenden, anstatt nur P- und I-Bilder."
-AMF.H264.BFrame.ReferenceDeltaQP="Delta QP für referenzierbare B-Bilder"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Delta QP wert zum letzten I- or P-Bild für referenzierbare B-Bilder."
-AMF.H264.DeblockingFilter="Entblockungsfilter"
-AMF.H264.DeblockingFilter.Description="Setze die Markierung dass der Decodierer einen Entblockungsfilter verwenden darf."
-AMF.H264.ScanType="Abtastverfahren"
-AMF.H264.ScanType.Description="Welches Abtastverfahren verwendet werden soll. Sollte immer '\@AMF.H264.ScanType.Progressive\@' sein."
-AMF.H264.ScanType.Progressive="Progressiv"
-AMF.H264.ScanType.Interlaced="Zeilensprung"
-AMF.H264.MotionEstimation="Bewegungsschätzung"
-AMF.H264.MotionEstimation.Description="Bewegungsschätzung erlaubt des dem Codierer die benötigte Bitrate zu reduzieren durch das herausfinden, wo ein Pixel hinbewegt wurde."
-AMF.H264.MotionEstimation.None="Keine"
-AMF.H264.MotionEstimation.Half="Halb-Pixel"
-AMF.H264.MotionEstimation.Quarter="Viertel-Pixel"
-AMF.H264.MotionEstimation.Both="Halb- & Viertel-Pixel"
-AMF.H264.CodingType="Codierungstyp"
-AMF.H264.CodingType.Description="Welcher Codierungstyp verwendet werden soll:\n* \@AMF.Util.Default\@ lässt AMF entscheiden (empfohlen).\n* CALVC (Context-Adaptive Variable-Length Coding) ist schneller aber größer.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) ist langsamer aber kleiner."
+Utility.Default="Standard"
+Utility.Automatic="Automatisch"
+Utility.Manual="Manuell"
+Utility.Switch.Disabled="Deaktiviert"
+Utility.Switch.Enabled="Aktiviert"
+Preset="Voreinstellung"
+Preset.ResetToDefaults="Standardeinstellungen wiederherstellen"
+Preset.Recording="Aufnahme"
+Preset.HighQuality="Hohe Qualität"
+Preset.Indistinguishable="Ununterscheidbar"
+Preset.Lossless="Verlustfrei"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Nutzungsart"
+Usage.Description="Auf welche Nutzungsart AMF eingestellt werden soll:\n- '\@Usage.Transcoding\@' für generelle Kodierung (empfohlen),\n- '\@Usage.UltraLowLatency\@' für Kodierung mit sehr niedriger Latenz,\n- '\@Usage.LowLatency\@' ist ähnlich dem oberen mit leicht erhöhter Latenz.\nNur '\@Usage.Transcoding\@' wird für das Streamen unterstützt, alle anderen können für Aufnahmen verwendet werden."
+Usage.Transcoding="Umwandeln"
+Usage.UltraLowLatency="Sehr Niedrige Latenz"
+Usage.LowLatency="Niedrige Latenz"
+Usage.Webcam="Webcam"
+QualityPreset="Qualitätsvoreinstellung"
+QualityPreset.Description="Welche Qualitätsvoreinstellungen AMF versuchen soll zu verwenden:\n- '\@QualityPreset.Speed\@' ist die schnellste aber hat die schlechteste Qualität,\n- '\@QualityPreset.Balanced\@' ist ein balancierter mix aus beiden,\n- '\@QualityPreset.Quality\@' gibt die beste Qualität für eine gegebene Bitrate."
+QualityPreset.Speed="Geschwindigkeit"
+QualityPreset.Balanced="Ausgeglichen"
+QualityPreset.Quality="Qualität"
+Profile="Profil"
+Profile.Description="Welches Profil für das Kodieren verwendet wird. Sortiert von am besten unterstützt (oben) bis zu bester Qualität (unten)."
+ProfileLevel="Profillevel"
+ProfileLevel.Description="Welches Profillevel für das Kodieren verwendet wird. Es ist am besten dies auf \@Utility.Automatic\@ zu lassen."
+Tier="Stufe"
+Tier.Description="Welche Stufe beim kodieren verwendet wird. 'High' ist für hohe Bitraten/Bandbreite gedacht während 'Main' eher für Mainstream Medien gedacht ist."
+AspectRatio="Seitenverhältnis"
+AspectRatio.Description="Welches Seitenverhältnis in die kodierte Ausgabe geschrieben werden soll."
+CodingType="Kodierungstyp"
+CodingType.Description="Welcher Kodierungstyp verwendet werden soll:\n* \@Utility.Automatic\@ lässt AMF entscheiden (empfohlen).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) ist schneller aber größer.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) ist langsamer aber kleiner."
+MaximumReferenceFrames="Maximale Referenzbilder"
+MaximumReferenceFrames.Description="Wie viele Bilder der Kodierer beim kodieren maximal referenzieren darf. Hat einen direkten Einfluss auf Kodierungsqualität."
+RateControlMethod="Ratenkontrollmethode"
+RateControlMethod.Description="Welche Ratenkontrollmethode verwendet werden soll:\n- '\@RateControlMethod.CQP\@' setzt feste QP Werte für I-/P-/B- Bilder,\n- '\@RateControlMethod.CBR\@' bleibt auf der Zielbitrate (mithilfe von Füllungsdaten) (empfohlen für das Streamen),\n- '\@RateControlMethod.VBR\@' bleibt unter der Spitzenbitrate,\n- '\@RateControlMethod.VBRLAT\@' bleibt nahe der Zielbitrate sofern GPU-Latenz und GPU-Benutzung dies erlauben, ansonsten wird eine höhere Bitrate verwendet (empfohlen für Aufnahmen)."
+RateControlMethod.CQP="Konstanter QP (CQP)"
+RateControlMethod.CBR="Konstante Bitrate (CBR)"
+RateControlMethod.VBR="Variable Bitrate (Eingeschränkt via Spitzenbitrate) (VBR)"
+RateControlMethod.VBRLAT="Variable Bitrate (Eingeschränkt via Latenz) (VBRLAT)"
+PrePassMode="Vordurchlaufsmodus"
+PrePassMode.Description="Vordurchlauf ist ein zweiter Bitratendistributionsdurchlauf welcher eine besser Verteilung der Bitrate innerhalb eine Sequenz erlaubt, aber die Effekte hiervon können von Karte zu Karte anders sein."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (Viertel der Größe)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (Hälfte der Größe)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (Volle Größe)"
+Bitrate.Target="Zielbitrate"
+Bitrate.Target.Description="Zielbitrate die in der ganzen Sequenz erreicht werden soll."
+Bitrate.Peak="Spitzenbitrate"
+Bitrate.Peak.Description="Spitzenbitrate die in der ganzen Sequenz erreicht werden darf."
+QP.IFrame="I-Bild QP"
+QP.IFrame.Description="Fester QP wert der für I-Bilder verwendet wird."
+QP.PFrame="P-Bild QP"
+QP.PFrame.Description="Fester QP wert der für P-Bilder verwendet wird."
+QP.BFrame="B-Bild QP"
+QP.BFrame.Description="Fester QP wert der für B-Bilder verwendet wird."
+QP.Minimum="Minimaler QP"
+QP.Minimum.Description="Niedrigster QP wert der in einem Bild verwendet wird."
+QP.IFrame.Minimum="Minimaler I-Bild QP"
+QP.IFrame.Minimum.Description="Niedrigster QP wert der in einem I-Bild verwendet wird."
+QP.PFrame.Minimum="Minimaler P-Bild QP"
+QP.PFrame.Minimum.Description="Niedrigster QP wert der in einem P-Bild verwendet wird."
+QP.Maximum="Maximaler QP"
+QP.Maximum.Description="Höchster QP wert der in einem Bild verwendet wird."
+QP.IFrame.Maximum="Maximaler I-Bild QP"
+QP.IFrame.Maximum.Description="Höchster QP wert der in einem I-Bild verwendet wird."
+QP.PFrame.Maximum="Maximaler P-Bild QP"
+QP.PFrame.Maximum.Description="Höchster QP wert der in einem P-Bild verwendet wird."
+FillerData="Füllungsdaten"
+FillerData.Description="Das aktivieren von Füllungsdaten erlaubt es dem Kodierer mindestens die \@Bitrate.Target\@ zu erreichen in dem dieser den verbleibenden Platz mit leeren Informationen füllt."
+FrameSkipping="Bildüberspringung"
+FrameSkipping.Description="Bildüberspringung erlaubt es dem Kodierer, Bilder zu überspringen um die \@Bitrate.Target\@ einzuhalten.\nWenn der Kodierer ein Bild überspringt, fügt dieser stattdessen ein repeat-last-frame NAL in den Stream ein.\nKann bei sehr niedriger \@Bitrate.Target\@ helfen."
+VBAQ="VBAQ"
+VBAQ.Description="Aktivieren der Verwendung der \"Auf Varianz basierte Adaptive Quantisierung\" (VBAQ) welche auf Pixel Veränderung basiert ist, um die Bitrate besser zu verteilen. \nEs basiert auf der Idee, dass das menschliche Auge weniger anfällig für Artefakte in stark strukturierte Flächen ist und erhöt so die Bitrate bei glatten Oberflächen. \nAktivierung kann zu Verbesserungen der subjektiven Qualität mit bestimmten Inhalten führen."
+EnforceHRD="Erzwinge HRD"
+EnforceHRD.Description="Erzwinge die Nutzung eines Hypothetischen Referenz Dekodierers welcher genutzt wird um den ausgehenden Datenstrom zu verifizieren."
+VBVBuffer="VBV Buffer"
+VBVBuffer.Description="Welche Methode genutzt werden soll um die VBV-Puffergröße zu bestimmen:\n- '\@Utility.Automatic\@' errechnet diese mithilfe einer strengen Einschränkung,\n- '\@Utilility.Manual\@' erlaubt es dem Nutzer die Größe zu kontrollieren.\nVBV (Videopufferungsverifizierer) Puffer wird von verschiedenen Ratenkontrollmethoden genutzt um die gesamte Bitrate innerhalb der Begrenzungen zu halten."
+VBVBuffer.Strictness="VBV Buffer Strenge"
+VBVBuffer.Strictness.Description="Legt die Einschränkungsstärke des VBV Buffers fest, wobei 100% so eingeschränkt wie möglich ist und 0% komplett uneingeschränkt."
+VBVBuffer.Size="VBV Buffer Größe"
+VBVBuffer.Size.Description="Die Größe des VBV Buffers, welcher für die Bitratenkontrolle in einer Sequenz verwendet wird."
+VBVBuffer.InitialFullness="VBV Buffer Anfängliche Füllung"
+VBVBuffer.InitialFullness.Description="Wie voll der VBV Buffer am Anfang ist (in %), hat nur einen Effekt auf die erste Sequenz beim kodieren."
+KeyframeInterval="Schlüsselbildintervall"
+KeyframeInterval.Description="Intervall (in Sekunden) zwischen Schlüsselbildern."
+H264.IDRPeriod="IDR Intervall (in Bildern)"
+H264.IDRPeriod.Description="Definiert die Distanz zwischen Sofortigen-Dekodierer-Aktualisierungen (IDR) in Frames. Setzt auch die Größe einer GOP-Sequenz fest."
+H265.IDRPeriod="IDR Intervall (in GOPs)"
+H265.IDRPeriod.Description="Definiert die Distanz zwischen Sofortigen-Dekodierer-Aktualisierungen (IDR) in GOPs."
+GOP.Type="GOP Typ"
+GOP.Type.Description="Welcher Typ an GOP verwendet werden soll:\n- '\@GOP.Type.Fixed\@' wird immer eine feste Distanz zwischen GOPs haben.\n- '\@GOP.Type.Variable\@' erlaubt GOPs mit variabler Größe, je nachdem was gebraucht wird.\n'\@GOP.Type.Fixed\@' ist was die H264 Implementierung verwendet und funktioniert am besten für lokales streamen, während '\@GOP.Type.Variable\@ am besten ist für Aufnahmen mit hoher Qualität und kleiner Größe."
+GOP.Type.Fixed="Fest"
+GOP.Type.Variable="Variabel"
+GOP.Size="GOP Größe"
+GOP.Size.Description="Größe eines GOP (Group Of Pictures / Gruppe Von Bildern) in Bildern."
+GOP.Size.Minimum="Minimale GOP Größe"
+GOP.Size.Minimum.Description="Minimale Größe eines GOP (Group Of Pictures / Gruppe Von Bildern) in Bildern."
+GOP.Size.Maximum="Maximale GOP Größe"
+GOP.Size.Maximum.Description="Maximale Größe eines GOP (Group Of Pictures / Gruppe Von Bildern) in Bildern."
+GOP.Alignment="GOP Ausrichtung"
+GOP.Alignment.Description="Experimentell, Effekte sind unbekannt. Benutzung auf eigene Gefahr."
+BFrame.Pattern="B-Bilder Struktur"
+BFrame.Pattern.Description="Wie viele B-Bilder beim kodieren verwendet werden sollen.\nWird von der 2ten und 3ten generation an VCE-Karten unterstützt. Negativer Einfluss auf Kodierungsperformanz."
+BFrame.DeltaQP="B-Bild Delta QP"
+BFrame.DeltaQP.Description="Delta QP wert zum letzten I- or P-Bild für nicht referenzierbare B-Bilder."
+BFrame.Reference="B-Bild Referenz"
+BFrame.Reference.Description="Erlaube einem B-Bild andere B-Bilder als referenz zu verwenden, anstatt nur P- und I-Bilder."
+BFrame.ReferenceDeltaQP="B-Bild Referenz Delta QP"
+BFrame.ReferenceDeltaQP.Description="Delta QP wert zum letzten I- or P-Bild für referenzierbare B-Bilder."

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/en-US.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/en-US.ini Changed

@@ -1,98 +1,166 @@
 # Shared
-AMF.Util.Default="Default"
-AMF.Util.Automatic="Automatic"
-AMF.Util.Manual="Manual"
-AMF.Util.Toggle.Disabled="Disabled"
-AMF.Util.Toggle.Enabled="Enabled"
-# H264
-# - Preset
-AMF.H264.Preset="Preset"
-AMF.H264.Preset.ResetToDefaults="Reset to Defaults"
-AMF.H264.Preset.Recording="Recording"
-AMF.H264.Preset.HighQuality="High Quality"
-AMF.H264.Preset.Indistinguishable="Indistinguishable"
-AMF.H264.Preset.Lossless="Lossless"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-# - Startup Properties
-AMF.H264.Usage="Usage"
-AMF.H264.Usage.Description="What usage AMF should be tuned for:\n- '\@AMF.H264.Usage.Transcoding\@' is general purpose transcoding (recommended),\n- '\@AMF.H264.Usage.UltraLowLatency\@' is for really low latency encoding,\n- '\@AMF.H264.Usage.LowLatency\@' is similar to above with a slightly higher latency.\nStreaming only supports '\@AMF.H264.Usage.Transcoding\@', all other values can be used for recording."
-AMF.H264.Usage.Transcoding="Transcoding"
-AMF.H264.Usage.UltraLowLatency="Ultra Low Latency"
-AMF.H264.Usage.LowLatency="Low Latency"
-AMF.H264.QualityPreset="Quality Preset"
-AMF.H264.QualityPreset.Description="What Quality Preset AMF should attempt to target:\n- '\@AMF.H264.QualityPreset.Speed\@' is the fastest but has the worst quality,\n- '\@AMF.H264.QualityPreset.Balanced\@' is a balanced mix of both,\n- '\@AMF.H264.QualityPreset.Quality\@' gives the best quality for a given bitrate."
-AMF.H264.QualityPreset.Speed="Speed"
-AMF.H264.QualityPreset.Balanced="Balanced"
-AMF.H264.QualityPreset.Quality="Quality"
-AMF.H264.Profile="Profile"
-AMF.H264.Profile.Description="Which H.264 Profile to use for encoding, sorted from highest quality to most widespread support."
-AMF.H264.ProfileLevel="Profile Level"
-AMF.H264.ProfileLevel.Description="Which H.264 Profile Level to use for encoding:\n- '\@AMF.Util.Automatic\@' calculates the best profile level for the given Frame Rate and Frame Size,\n- '4.1' supports 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' supports 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' supports 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' supports 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' supports 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-# - Rate Control Properties
-AMF.H264.RateControlMethod="Rate Control Method"
-AMF.H264.RateControlMethod.Description="What rate control method should be used:\n- '\@AMF.H264.RateControlMethod.CQP\@' assigns fixed I-/P-/B-Frame QP values,\n- '\@AMF.H264.RateControlMethod.CBR\@' stays at the given Target Bitrate (using Filler Data) (recommended for streaming),\n- '\@AMF.H264.RateControlMethod.VBR\@' stays below the given Peak Bitrate,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' stays close to the Target Bitrate if GPU latency and load allow for it, otherwise will use higher bitrate (recommended for recording)."
-AMF.H264.RateControlMethod.CQP="Constant QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Constant Bitrate (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Variable Bitrate (Peak Constrained) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Variable Bitrate (Latency Constrained) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Target Bitrate"
-AMF.H264.Bitrate.Target.Description="Bitrate to attempt to achieve in the overall sequence."
-AMF.H264.Bitrate.Peak="Peak Bitrate"
-AMF.H264.Bitrate.Peak.Description="Bitrate to attempt to maximally peak to in the overall sequence."
-AMF.H264.QP.Minimum="Minimum QP"
-AMF.H264.QP.Minimum.Description="Lowest QP value to use in a Frame."
-AMF.H264.QP.Maximum="Maximum QP"
-AMF.H264.QP.Maximum.Description="Highest QP value to use in a Frame."
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.IFrame.Description="Fixed QP value to use for I-Frames."
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.PFrame.Description="Fixed QP value to use for P-Frames."
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.QP.BFrame.Description="Fixed QP value to use for B-Frames."
-AMF.H264.VBVBuffer="VBV Buffer"
-AMF.H264.VBVBuffer.Description="What method should be used to determine the VBV Buffer Size:\n- '\@AMF.Util.Automatic\@' calculates the size using a strictness constraint,\n- '\@AMF.Util.Manual\@' allows the user to control the size.\nVBV (Video Buffering Verifier) Buffer is used by certain Rate Control Methods to keep the overall bitrate within the given constraints."
-AMF.H264.VBVBuffer.Strictness="VBV Buffer Strictness"
-AMF.H264.VBVBuffer.Strictness.Description="Determines the strictness of the VBV Buffer, with 100% being as strict as possible and 0% being unrestricted."
-AMF.H264.VBVBuffer.Size="VBV Buffer Size"
-AMF.H264.VBVBuffer.Size.Description="The size of the VBV Buffer which is used for Bitrate control in a sequence."
-AMF.H264.VBVBuffer.Fullness="VBV Buffer Fullness"
-AMF.H264.VBVBuffer.Fullness.Description="How full the VBV Buffer initially is, will only affect the initial sequence of encoding."
-AMF.H264.FillerData="Filler Data"
-AMF.H264.FillerData.Description="Enabling Filler Data allows the encoder to keep at least the Target Bitrate by filling up the remaining space in a sequence with empty information."
-AMF.H264.FrameSkipping="Frame Skipping"
-AMF.H264.FrameSkipping.Description="Frame Skipping allows the encoder to drop frames in order to meet Target Bitrate requirements.\nWhen the encoder drops a frame it instead insert a repeat-last-frame NAL into the stream.\nCan help with very low Target Bitrates."
-AMF.H264.EnforceHRDCompatibility="Enforce HRD Compatibility"
-AMF.H264.EnforceHRDCompatibility.Description="Enforce Hypothetical Reference Decoder restrictions which limit the maximum QP value change within a frame."
-# - Picture Control Properties
-AMF.H264.KeyframeInterval="Keyframe Interval"
-AMF.H264.KeyframeInterval.Description="Defines the distance between Keyframes in seconds. Also controls GOP-sequence size."
-AMF.H264.IDRPeriod="IDR Period"
-AMF.H264.IDRPeriod.Description="Defines the distance between Instantaneous Decoding Refreshes (IDR) in frames. Also controls GOP-sequence size."
-AMF.H264.BFrame.Pattern="B-Frames"
-AMF.H264.BFrame.Pattern.Description="The amount of B-Frames to use while encoding.\nSupported by 2nd and 3rd Generation VCE cards. Negative impact on encoding performance."
-AMF.H264.BFrame.DeltaQP="Delta QP for B-Frames"
-AMF.H264.BFrame.DeltaQP.Description="Delta QP value to the last I- or P-Frame for non-referenceable B-Frames."
-AMF.H264.BFrame.Reference="Referenceable B-Frames"
-AMF.H264.BFrame.Reference.Description="Allow a B-Frame to also use B-Frames as reference, instead of just P- and I-Frames."
-AMF.H264.BFrame.ReferenceDeltaQP="Delta QP for referenceable B-Frames"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Delta QP value to the last I- or P-Frame for referenceable B-Frames."
-AMF.H264.DeblockingFilter="Deblocking Filter"
-AMF.H264.DeblockingFilter.Description="Sets the flag that the decoder is allowed to use a Deblocking Filter for the encoded stream."
-# - Miscellaneous Properties
-AMF.H264.ScanType="Scan Type"
-AMF.H264.ScanType.Description="Which scanning method to use, always leave this on '\@AMF.H264.ScanType.Progressive\@'."
-AMF.H264.ScanType.Progressive="Progressive"
-AMF.H264.ScanType.Interlaced="Interlaced"
-AMF.H264.MotionEstimation="Motion Estimation"
-AMF.H264.MotionEstimation.Description="Motion Estimation allows the encoder to reduce needed bitrate by estimating where a pixel went."
-AMF.H264.MotionEstimation.None="None"
-AMF.H264.MotionEstimation.Half="Half-Pixel"
-AMF.H264.MotionEstimation.Quarter="Quarter-Pixel"
-AMF.H264.MotionEstimation.Both="Half- & Quarter-Pixel"
+Utility.Default="Default"
+Utility.Automatic="Automatic"
+Utility.Manual="Manual"
+Utility.Switch.Disabled="Disabled"
+Utility.Switch.Enabled="Enabled"
+Preset="Preset"
+Preset.ResetToDefaults="Reset to Defaults"
+Preset.Recording="Recording"
+Preset.HighQuality="High Quality"
+Preset.Indistinguishable="Indistinguishable"
+Preset.Lossless="Lossless"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+# Static
+Usage="Usage"
+Usage.Description="What usage AMF should be tuned for:\n- '\@Usage.Transcoding\@' is general purpose transcoding (recommended),\n- '\@Usage.UltraLowLatency\@' is for really low latency encoding,\n- '\@Usage.LowLatency\@' is similar to above with a slightly higher latency.\nStreaming only supports '\@Usage.Transcoding\@', all other values can be used for recording."
+Usage.Transcoding="Transcoding"
+Usage.UltraLowLatency="Ultra Low Latency"
+Usage.LowLatency="Low Latency"
+Usage.Webcam="Webcam"
+QualityPreset="Quality Preset"
+QualityPreset.Description="What Quality Preset AMF should attempt to target:\n- '\@QualityPreset.Speed\@' is the fastest but has the worst quality,\n- '\@QualityPreset.Balanced\@' is a balanced mix of both,\n- '\@QualityPreset.Quality\@' gives the best quality for a given bitrate."
+QualityPreset.Speed="Speed"
+QualityPreset.Balanced="Balanced"
+QualityPreset.Quality="Quality"
+Profile="Profile"
+Profile.Description="What Profile to encode with. Sorted from best supported (top) to best quality (bottom)."
+ProfileLevel="Profile Level"
+ProfileLevel.Description="What Profile Level to use. It is best to leave this at \@Utility.Automatic\@."
+Tier="Tier"
+Tier.Description="What Tier to encode at. 'High' targets high bitrate/bandwidth uses while 'Main' is aimed at mainstream media."
+AspectRatio="Aspect Ratio"
+AspectRatio.Description="Which Aspect Ratio should be written into the output file."
+CodingType="Coding Type"
+CodingType.Description="Which type of coding to use:\n* '\@Utility.Automatic\@' lets AMF decide (recommended).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) is faster, but larger.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) is slower, but smaller."
+MaximumReferenceFrames="Maximum Reference Frames"
+MaximumReferenceFrames.Description="How many Frames the encoder may reference at most when encoding. Has a direct impact on encoding quality."
+# Rate Control
+RateControlMethod="Rate Control Method"
+RateControlMethod.Description="What rate control method should be used:\n- '\@RateControlMethod.CQP\@' assigns fixed I-/P-/B-Frame QP values,\n- '\@RateControlMethod.CBR\@' stays at the given Target Bitrate (using Filler Data) (recommended for streaming),\n- '\@RateControlMethod.VBR\@' stays below the given Peak Bitrate,\n- '\@RateControlMethod.VBRLAT\@' stays close to the Target Bitrate if GPU latency and load allow for it, otherwise will use higher bitrate (recommended for recording)."
+RateControlMethod.CQP="Constant QP (CQP)"
+RateControlMethod.CBR="Constant Bitrate (CBR)"
+RateControlMethod.VBR="Variable Bitrate (Peak Constrained) (VBR)"
+RateControlMethod.VBRLAT="Variable Bitrate (Latency Constrained) (VBRLAT)"
+PrePassMode="Pre-Pass Mode"
+PrePassMode.Description="Pre-Pass is a secondary bitrate distribution pass that allows for better distribution of the bitrate within a sequence, however the effects of this may vary from card to card."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (Quarter Size)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (Half Size)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (Full Size)"
+Bitrate.Target="Target Bitrate"
+Bitrate.Target.Description="Bitrate to attempt to achieve in the overall sequence."
+Bitrate.Peak="Peak Bitrate"
+Bitrate.Peak.Description="Bitrate to attempt to maximally peak to in the overall sequence."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Fixed QP value to use for I-Frames."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Fixed QP value to use for P-Frames."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Fixed QP value to use for B-Frames."
+QP.Minimum="Minimum QP"
+QP.Minimum.Description="Lowest QP value to use in a Frame."
+QP.IFrame.Minimum="Minimum I-Frame QP"
+QP.IFrame.Minimum.Description="Lowest QP value to use in an I-Frame."
+QP.PFrame.Minimum="Minimum P-Frame QP"
+QP.PFrame.Minimum.Description="Lowest QP value to use in a P-Frame."
+QP.Maximum="Maximum QP"
+QP.Maximum.Description="Highest QP value to use in a Frame."
+QP.IFrame.Maximum="Maximum I-Frame QP"
+QP.IFrame.Maximum.Description="Highest QP value to use in an I-Frame."
+QP.PFrame.Maximum="Maximum P-Frame QP"
+QP.PFrame.Maximum.Description="Highest QP value to use in a P-Frame."
+FillerData="Filler Data"
+FillerData.Description="Enabling Filler Data allows the encoder to keep at least the \@Bitrate.Target\@ by filling up the remaining space in a sequence with empty information."
+FrameSkipping="Frame Skipping"
+FrameSkipping.Description="Frame Skipping allows the encoder to skip frames in order to meet the \@Bitrate.Target\@ requirements.\nWhen the encoder skips a frame it instead insert a repeat-last-frame NAL into the stream.\nCan help with very low \@Bitrate.Target\@ requirements."
+FrameSkipping.Period="Skip-Frame Period"
+FrameSkipping.Period.Description="Interval (in Frames) between skipped frames. This can be used to simulate a lower framerate than OBS is set to while still having a valid stream."
+FrameSkipping.Behaviour="Skip-Frame Behaviour"
+FrameSkipping.Behaviour.Description="Define how Frame Skipping behaves."
+FrameSkipping.SkipNth="Skip only every Nth frame"
+FrameSkipping.KeepNth="Keep only every Nth frame"
+VBAQ="VBAQ"
+VBAQ.Description="Enable the use of 'Variance Based Adaptive Quantization' (VBAQ) which is based on pixel variance to distribute bitrate better.\nIt works on the idea that the human visual system is less sensitive to artifacts in highly textured areas and thus will push the bitrate towards smoother surfaces.\nEnabling this may lead to improvements in subjective quality with certain content."
+EnforceHRD="Enforce HRD"
+EnforceHRD.Description="Enforce the use of a Hypothetical Reference Decoder which is used to verify that the output bitstream is correct."
+# VBV Buffer
+VBVBuffer="VBV Buffer"
+VBVBuffer.Description="What method should be used to determine the VBV Buffer Size:\n- '\@Utility.Automatic\@' calculates the size using a strictness constraint,\n- '\@Utility.Manual\@' allows the user to control the size.\nVBV (Video Buffering Verifier) Buffer is used by certain Rate Control Methods to keep the overall bitrate within the given constraints."
+VBVBuffer.Strictness="VBV Buffer Strictness"
+VBVBuffer.Strictness.Description="Determines the strictness of the VBV Buffer, with 100% being as strict as possible and 0% being unrestricted."
+VBVBuffer.Size="VBV Buffer Size"
+VBVBuffer.Size.Description="The size of the VBV Buffer which is used for Bitrate control in a sequence."
+VBVBuffer.InitialFullness="VBV Buffer Initial Fullness"
+VBVBuffer.InitialFullness.Description="How full the VBV Buffer initially is (in %), will only affect the initial sequence of encoding."
+# Picture Control
+Interval.Keyframe="Keyframe Interval"
+Interval.Keyframe.Description="Interval (in Seconds) between Keyframes."
+Period.IDR.H264="IDR Period (in Frames)"
+Period.IDR.H264.Description="Defines the distance between Instantaneous Decoding Refreshes (IDR) in frames."
+Period.IDR.H265="IDR Period (in GOPs)"
+Period.IDR.H265.Description="Defines the distance between Instantaneous Decoding Refreshes (IDR) in GOPs."
+Interval.IFrame="I-Frame Interval"
+Interval.IFrame.Description="Interval (in Seconds) between I-Frames. I-Frames override P-Frames and B-Frames."
+Period.IFrame="I-Frame Period (in Frames)"
+Period.IFrame.Description="Distance (in Frames) between I-Frames. I-Frames override P-Frames and B-Frames."
+Interval.PFrame="P-Frame Interval"
+Interval.PFrame.Description="Interval (in Seconds) between P-Frames. P-Frames override B-Frames."

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/es-ES.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/es-ES.ini Changed

@@ -1,90 +1,135 @@
-AMF.Util.Default="Por defecto"
-AMF.Util.Automatic="Automático"
-AMF.Util.Manual="Manual"
-AMF.Util.Toggle.Disabled="Deshabilitado"
-AMF.Util.Toggle.Enabled="Habilitado"
-AMF.H264.Preset="Preajuste"
-AMF.H264.Preset.ResetToDefaults="Restablecer por defecto"
-AMF.H264.Preset.Recording="Grabación"
-AMF.H264.Preset.HighQuality="Alta Calidad"
-AMF.H264.Preset.Indistinguishable="Indistinguible"
-AMF.H264.Preset.Lossless="Sin pérdidas"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Uso"
-AMF.H264.Usage.Description="A que uso debe ajustarse AMF:\n- 'Codificación' es para uso generalizado (recomendado),\n- 'Ultra Baja Latencia' es para codificación de muy baja latencia,\n- 'Baja Latencia' es similar a la anterior con algo mas de latencia.\nLas emisiones en directo solo soportan 'Codificación', todos los valores pueden ser usados para grabar."
-AMF.H264.Usage.Transcoding="Codificación"
-AMF.H264.Usage.UltraLowLatency="Latencia ultra baja"
-AMF.H264.Usage.LowLatency="Latencia baja"
-AMF.H264.QualityPreset="Calidad del perfil"
-AMF.H264.QualityPreset.Description="Que calidad del perfil de AMD se debe intentar conseguir:\n- 'Velocidad' es la mas rápida pero la que peor calidad obtiene,\n- 'Equilibrado' está entre 'Velocidad' y 'Calidad' ofreciendo un balance entre los dos,\n- 'Calidad' ofrece la mejor calidad posible para una determinada tasa de bits."
-AMF.H264.QualityPreset.Speed="Velocidad"
-AMF.H264.QualityPreset.Balanced="Equilibrado"
-AMF.H264.QualityPreset.Quality="Calidad"
-AMF.H264.Profile="Perfil del Códec"
-AMF.H264.Profile.Description="Que perfil H.264 a utilizar para la codificación:\n- 'Baseline' tiene el mayor soporte en las plataformas,\n- 'Main' es compatible con dispositivos algo mas anticuados (recomendado si la emisión va dirigida a dispositivos móviles),\n- 'High' es compatible con los dispositivos actuales (recomendado)."
-AMF.H264.ProfileLevel="Nivel del Perfil"
-AMF.H264.ProfileLevel.Description="Nivel de perfil H.264 a utilizar para la codificación:\n- 'Automático' calcula el mejor nivel de perfil para cierta velocidad y tamaño de fotogramas,\n- '4.1' soporta 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' soporta 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' soporta 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' soporta 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' soporta 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Método de control del flujo"
-AMF.H264.RateControlMethod.Description="Qué método de control de flujo debe ser usado:\n- '\@AMF.H264.RateControlMethod.CQP\@' asigna valores fijos de QP en I-/P-/B-Frames (Parámetro de cuantización),\n- '\@AMF.H264.RateControlMethod.CBR\@' se mantiene en la tasa de bits objetivo (usando Datos de relleno) (recomendado para emisiones en directo),\n- '\@AMF.H264.RateControlMethod.VBR\@' se mantiene por debajo de un pico de tasa de bits,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' se mantiene cerca de la tasa de bits deseada si la latencia y carga de la GPU lo permite, si no se aumentará la tasa de bits (recomendado para grabaciones)."
-AMF.H264.RateControlMethod.CQP="QP constante (CQP)"
-AMF.H264.RateControlMethod.CBR="Flujo constante (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Flujo variable (pico restringido) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Flujo variable (latencia restringida) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Tasa de bits deseada"
-AMF.H264.Bitrate.Target.Description="Tasa de bits a intentar alcanzar en la secuencia general."
-AMF.H264.Bitrate.Peak="Pico de tasa de bits"
-AMF.H264.Bitrate.Peak.Description="Tasa de bits a intentar alcanzar como pico máximo en la secuencia general."
-AMF.H264.QP.Minimum="QP Mínimo"
-AMF.H264.QP.Minimum.Description="Valor mínimo de QP (parámetro de cuantización) a utilizar en un fotograma."
-AMF.H264.QP.Maximum="QP Máximo"
-AMF.H264.QP.Maximum.Description="Valor máximo de QP (parámetro de cuantización) a utilizar en un fotograma."
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.IFrame.Description="Valor fijo de QP para I-Frames."
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.PFrame.Description="Valor fijo de QP para P-Frames."
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.QP.BFrame.Description="Valor de QP Fijo (parámetro de cuantización) a usar por B-Frames."
-AMF.H264.VBVBuffer="Buffer VBV"
-AMF.H264.VBVBuffer.Description="Que método se debe usar para determinar el tamaño del buffer VBV:\n- 'Automático' calcula el tamaño usando una restricción estricta,\n- 'Manual' permite al usuario controlar el tamaño.\nEl buffer VBV (Verificador de Buffering de Video) es usado por ciertos métodos de control del flujo para mantener la tasa de bits dentro de los parámetros establecidos."
-AMF.H264.VBVBuffer.Strictness="Estricticidad del Buffer VBV"
-AMF.H264.VBVBuffer.Strictness.Description="Determina la rigidez del Buffer VBV, con 100% siendo tan estricto como sea posible y 0% sin restricción."
-AMF.H264.VBVBuffer.Size="Tamaño de buffer VBV"
-AMF.H264.VBVBuffer.Size.Description="Tamaño del Buffer VBV que se utiliza para el control de Bitrate en una secuencia."
-AMF.H264.VBVBuffer.Fullness="Amplitud del Buffer VBV"
-AMF.H264.VBVBuffer.Fullness.Description="Como de lleno es el buffer VMV inicialmente, solo afectará a la secuencia inicial de la codificación."
-AMF.H264.FillerData="Datos de relleno"
-AMF.H264.FillerData.Description="Habilitando Datos de relleno se permite al codificador mantener por lo menos la tasa de bits deseada rellenando el espacio que falta con información sin valor."
-AMF.H264.FrameSkipping="Omisión de fotogramas"
-AMF.H264.FrameSkipping.Description="Omisión de fotogramas permite al codificador saltar fotogramas para cumplir con el requerimiento de la tasa de bits objetivo.\nCuando el codificador salta un fotograma insertará un NAL que repetirá el ultimo fotograma codificado en el stream.\nPuede ayudar con tasa de bits objetivo muy bajas."
-AMF.H264.EnforceHRDCompatibility="Forzar compatibilidad con HRD"
-AMF.H264.EnforceHRDCompatibility.Description="Forzar las restricciones del decodificador hipotético de referencia que limitan el cambio de valor máximo de QP dentro de un fotograma.\nNo recomendado para grabación o emisión en directo y solo se debe usar cuando el objetivo son dispositivos antiguos que solo tienen decodificadores de referencia por software."
-AMF.H264.KeyframeInterval="Intervalo de fotogramas clave"
-AMF.H264.KeyframeInterval.Description="Cuantos segundos deben haber entre fotogramas que no se pueden descartar.\nTambién controla el tamaño de la secuencia (GOP)."
-AMF.H264.IDRPeriod="Periodo IDR"
-AMF.H264.IDRPeriod.Description="Define la distancia entre Instantaneous Decoding Refreshes (IDR) en Fotogramas. También controla el tamaño de la secuencia del GOP."
-AMF.H264.BFrame.Pattern="B-Frames"
-AMF.H264.BFrame.Pattern.Description="La cantidad de B-Frames a usar mientras se codifica.\nSoportado con tarjetas de 2 º y 3 º generación VCE. Impacto negativo en el rendimiento de codificación."
-AMF.H264.BFrame.DeltaQP="Delta QP para B-Frames"
-AMF.H264.BFrame.DeltaQP.Description="Valor Delta QP para el ultimo I- o P-Frame para B-Frames no referenciables."
-AMF.H264.BFrame.Reference="B-Frames referenciables"
-AMF.H264.BFrame.Reference.Description="Permitir a un B-Frame utilizar también B-Frames como referencia, en lugar de P - y I-Frames."
-AMF.H264.BFrame.ReferenceDeltaQP="Delta QP para los fotogramas referenciables"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Valor Delta QP para el ultimo I- o P-Frame para B-Frames referenciables."
-AMF.H264.DeblockingFilter="Filtro de eliminación de bloques"
-AMF.H264.DeblockingFilter.Description="Establece el indicador de que el decodificador está permitido a usar el Filtro de eliminación de bloques para el stream codificado."
-AMF.H264.ScanType="Tipo de escaneo"
-AMF.H264.ScanType.Description="Que método de escaneo usar, dejar siempre en 'Progresivo'."
-AMF.H264.ScanType.Progressive="Progresivo"
-AMF.H264.ScanType.Interlaced="Entrelazado"
-AMF.H264.MotionEstimation="Estimación de movimiento"
-AMF.H264.MotionEstimation.Description="Estimación de movimiento permite al codificador reducir el flujo de datos necesario estimando de donde vienen los pixeles."
-AMF.H264.MotionEstimation.None="Ninguno"
-AMF.H264.MotionEstimation.Half="Mitad de Pixel"
-AMF.H264.MotionEstimation.Quarter="Cuarto de Pixel"
-AMF.H264.MotionEstimation.Both="Mitad y cuarto de Pixel"
-AMF.H264.CodingType="Tipo de codificación"
-AMF.H264.CodingType.Description="Qué tipo de codificación utilizar:\n* \@AMF.Util.Default\@ deja que AMF lo decida (recomendado).\n* CALVC (Context-Adaptive Variable-Length Coding) es más rápido, pero más grande.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) es más lento, pero más pequeño."
+Utility.Default="Por defecto"
+Utility.Automatic="Automático"
+Utility.Manual="Manual"
+Utility.Switch.Disabled="Deshabilitado"
+Utility.Switch.Enabled="Habilitado"
+Preset="Preselección"
+Preset.ResetToDefaults="Restablecer por defecto"
+Preset.Recording="Grabación"
+Preset.HighQuality="Alta Calidad"
+Preset.Indistinguishable="Indistinguible"
+Preset.Lossless="Sin pérdidas"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Uso"
+Usage.Description="A que uso debe ajustarse AMF:\n- '\@Usage.Transcoding\@' es para uso generalizado (recomendado),\n- '\@Usage.UltraLowLatency\@' es para codificación de muy baja latencia,\n- '\@Usage.LowLatency\@' es similar a la anterior con algo mas de latencia.\nLas emisiones en directo solo soportan '\@Usage.Transcoding\@', todos los valores pueden ser usados para grabar."
+Usage.Transcoding="Transcodificación"
+Usage.UltraLowLatency="Latencia ultra baja"
+Usage.LowLatency="Latencia baja"
+Usage.Webcam="Webcam"
+QualityPreset="Calidad del perfil"
+QualityPreset.Description="Qué preajuste de calidad debe AMF intentar usar:\n- '\@QualityPreset.Speed\@' es el más rápido pero tiene la peor calidad, \n-'\@QualityPreset.Balanced\@' es una mezcla equilibrada de ambos,\n- '\@QualityPreset.Quality\@' da la mejor calidad para un determinado bitrate."
+QualityPreset.Speed="Velocidad"
+QualityPreset.Balanced="Equilibrado"
+QualityPreset.Quality="Calidad"
+Profile="Perfíl"
+Profile.Description="Perfil con el que codificar. Ordenados de mejor soportado (arriba) a mejor calidad (abajo)."
+ProfileLevel="Nivel del Perfil"
+ProfileLevel.Description="Qué nivel de perfil a utilizar. Es mejor dejar esto en \@Utility.Automatic\@."
+Tier="Nivel"
+Tier.Description="Nivel en el que codificar. 'Alta' apunta a usos de alto bitrate/ancho de banda mientras 'Principal' está dirigido a medios de comunicación."
+AspectRatio="Relación de aspecto"
+AspectRatio.Description="Proporción de aspecto que debe escribirse en el archivo de salida."
+CodingType="Tipo de codificación"
+CodingType.Description="Qué tipo de codificación utilizar:\n* '\@Utility.Automatic\@' deja que AMF lo decida (recomendado).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) es más rápido, pero más grande.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) es más lento, pero más pequeño."
+MaximumReferenceFrames="Fotogramas de referencia máximos"
+MaximumReferenceFrames.Description="Cuántos fotogramas el codificador puede hacer referencia como mucho al codificar, tiene un impacto directo en la calidad de codificación."
+RateControlMethod="Método de control del flujo"
+RateControlMethod.Description="Qué método de control de flujo debe ser usado:\n- '\@RateControlMethod.CQP\@' asigna valores fijos de QP en I-/P-/B-Frames,\n- '\@RateControlMethod.CBR\@' se mantiene en la tasa de bits objetivo (usando Datos de relleno) (recomendado para emisiones en directo),\n- '\@RateControlMethod.VBR\@' se mantiene por debajo de un pico de tasa de bits,\n- '\@RateControlMethod.VBRLAT\@' se mantiene cerca de la tasa de bits deseada si la latencia y carga de la GPU lo permite, si no se aumentará la tasa de bits (recomendado para grabaciones)."
+RateControlMethod.CQP="QP constante (CQP)"
+RateControlMethod.CBR="Flujo constante (CBR)"
+RateControlMethod.VBR="Flujo variable (pico restringido) (VBR)"
+RateControlMethod.VBRLAT="Flujo variable (latencia restringida) (VBRLAT)"
+PrePassMode="Modo de Pre-Paso"
+PrePassMode.Description="Pre-Paso es un pase de distribución de bitrate secundario que permite la mejor distribución de la velocidad de bits dentro de una secuencia, sin embargo sus efectos pueden variar según la tarjeta."
+PrePassMode.Quarter="\@Utility.switch.Enabled\@ (cuarto de tamaño)"
+PrePassMode.Half="\@Utility.switch.Enabled\@ (mitad de tamaño)"
+PrePassMode.Full="\@Utility.switch.Enabled\@ (tamaño completo)"
+Bitrate.Target="Tasa de bits deseada"
+Bitrate.Target.Description="Tasa de bits a intentar alcanzar en la secuencia general."
+Bitrate.Peak="Pico de tasa de bits"
+Bitrate.Peak.Description="Tasa de bits a intentar alcanzar como pico máximo en la secuencia general."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Valor fijo de QP para I-Frames."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Valor fijo de QP para P-Frames."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Valor fijo de QP para B-Frames."
+QP.Minimum="QP Mínimo"
+QP.Minimum.Description="Valor mas bajo de QP para utilizar en un fotograma."
+QP.IFrame.Minimum="I-Frame QP mínimo"
+QP.IFrame.Minimum.Description="Valor mas bajo de QP para utilizar en un I-Frame."
+QP.PFrame.Minimum="P-Frame QP mínimo"
+QP.PFrame.Minimum.Description="Valor mas bajo de QP para utilizar en un P-Frame."
+QP.Maximum="QP Máximo"
+QP.Maximum.Description="Valor mas alto de QP para utilizar en un fotograma."
+QP.IFrame.Maximum="I-Frame QP máximo"
+QP.IFrame.Maximum.Description="Valor mas alto de QP para utilizar en un I-Frame."
+QP.PFrame.Maximum="P-Frame QP máximo"
+QP.PFrame.Maximum.Description="Valor mas alto de QP para utilizar en un P-Frame."
+FillerData="Datos de relleno"
+FillerData.Description="Habilitando Datos de relleno se permite al codificador mantener por lo menos la \@Bitrate.Target\@ rellenando el espacio que falta con información sin valor."
+FrameSkipping="Omisión de fotogramas"
+FrameSkipping.Description="Omisión de fotogramas permite al codificador saltar fotogramas para cumplir con el requerimiento de la \@Bitrate.Target\@.\nCuando el codificador salta un fotograma insertará un NAL que repetirá el ultimo fotograma codificado en el stream.\nPuede ayudar con \@Bitrate.Target\@ muy bajas."
+VBAQ="VBAQ"
+VBAQ.Description="Habilitar el uso de 'Cuantizacion adaptativa basada en Varianza' (VBAQ) que se basa en la varianza del pixel para una mejor distribución del bitrate. \nFunciona con la idea de que el sistema visual humano es menos sensible a los artefactos en áreas altamente texturadas y así moverá el bitrate hacia superficies más suaves. \nHabilitando esto puede llevar a mejoras en la calidad subjetiva en cierto contenido."
+EnforceHRD="Forzar HRD"
+EnforceHRD.Description="Forzar el uso de un decodificador de referencia hipotético que se utiliza para verificar que el flujo de bits de salida es correcto."
+VBVBuffer="Buffer VBV"
+VBVBuffer.Description="Que método se debe usar para determinar el tamaño del buffer VBV:\n- '\@Utlity.Automatic\@' calcula el tamaño usando una restricción estricta,\n- '\@Utlity.Manual\@' permite al usuario controlar el tamaño.\nEl buffer VBV (Verificador de Buffering de Video) es usado por ciertos métodos de control del flujo para mantener la tasa de bits dentro de los parámetros establecidos."
+VBVBuffer.Strictness="Estricticidad del Buffer VBV"
+VBVBuffer.Strictness.Description="Determina la rigidez del Buffer VBV, con 100% siendo tan estricto como sea posible y 0% sin restricción."
+VBVBuffer.Size="Tamaño de buffer VBV"
+VBVBuffer.Size.Description="Tamaño del Buffer VBV que se utiliza para el control de Bitrate en una secuencia."
+VBVBuffer.InitialFullness="Amplitud Inicial del Buffer VBV"
+VBVBuffer.InitialFullness.Description="Como de lleno es el buffer VMV inicialmente (en %), solo afectará a la secuencia inicial de la codificación."
+KeyframeInterval="Intervalo de fotogramas clave"
+KeyframeInterval.Description="Intervalo (en segundos) entre fotogramas clave."
+H264.IDRPeriod="Período de IDR (en fotogramas)"
+H264.IDRPeriod.Description="Define la distancia entre Instantaneous Decoding Refreshes (IDR) en Fotogramas. También controla el tamaño de la secuencia del GOP."
+H265.IDRPeriod="Período de IDR (en GOP's)"
+H265.IDRPeriod.Description="Define la distancia entre Instantaneous Decoding Refreshes (IDR) en GOPs."
+GOP.Type="Tipo de GOP"
+GOP.Type.Description="Qué tipo de GOP se debe utilizar: \n - ' \@GOP. Type.Fixed\@' utilizará siempre distancias fijas entre cada GOP. \n - ' \@GOP. Type.Variable\@' permite GOPs de diferentes tamaños, dependiendo de lo que se necesite.\n'\@GOP. Type.Fixed\@' es cómo los trabajos de implementación H264 y lo mejor para los streaming en red local, mientras que ' \@GOP. Type.Variable\@' es el mejor para grabaciones de alta calidad de bajo tamaño."
+GOP.Type.Fixed="Fijo"
+GOP.Type.Variable="Variable"
+GOP.Size="Tamaño del GOP"
+GOP.Size.Description="Tamaño máximo de un GOP (grupo de imagenes) en fotogramas."
+GOP.Size.Minimum="Tamaño mínimo tamaño de GOP"
+GOP.Size.Minimum.Description="Tamaño mínimo de un GOP (grupo de imágenes) en fotogramas."
+GOP.Size.Maximum="Tamaño mínimo de GOP"
+GOP.Size.Maximum.Description="Tamaño máximo de un GOP (grupo de imagenes) en fotogramas."
+GOP.Alignment="Alineación del GOP"
+GOP.Alignment.Description="Experimental, los efectos son desconocidos. Usar bajo su propio riesgo."
+BFrame.Pattern="Patrón de B-Frame"
+BFrame.Pattern.Description="La cantidad de B-Frames a usar mientras se codifica.\nSoportado por tarjetas de 2ª y 3ª generación de VCE. Impacto negativo en el rendimiento de codificación."
+BFrame.DeltaQP="Delta QP en B-Frames"
+BFrame.DeltaQP.Description="Valor Delta QP para el ultimo I- o P-Frame para B-Frames no referenciables."
+BFrame.Reference="Referencia de B-Frames"
+BFrame.Reference.Description="Permitir a un B-Frame utilizar también B-Frames como referencia, en lugar de P - y I-Frames."
+BFrame.ReferenceDeltaQP="Delta QP en B-Frames de referencia"
+BFrame.ReferenceDeltaQP.Description="Valor Delta QP para el ultimo I- o P-Frame para B-Frames referenciables."
+DeblockingFilter="Filtro de eliminación de bloques"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/eu-ES.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/eu-ES.ini Changed

@@ -1,86 +1,37 @@
-AMF.Util.Default="Lehenetsia"
-AMF.Util.Automatic="Automatikoa"
-AMF.Util.Manual="Eskuz"
-AMF.Util.Toggle.Disabled="Ezgaituta"
-AMF.Util.Toggle.Enabled="Gaituta"
-AMF.H264.Preset="Aurrezarrita"
-AMF.H264.Preset.ResetToDefaults="Berrezarri balio lehenetsiak"
-AMF.H264.Preset.Recording="Grabatzen"
-AMF.H264.Preset.HighQuality="Kalitate handia"
-AMF.H264.Preset.Indistinguishable="Sumaezina"
-AMF.H264.Preset.Lossless="Galerarik gabe"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Erabilpena"
-AMF.H264.Usage.Description="AMFrentzat zer erabilerak aukeratu behar dira:\n- 'Transcoding' oro har proposatzen da transmisiorako (gomendatua),\n- 'Ultra Low Latency' latentzia oso baxuko kodetzerako,\n- 'Low Latency' aurrekoaren antzekoa da latentzia apur bat handiagoarekin.\nStreaming bakarrik onartzen du 'Transcoding', gainerako balio guztiak erabili daitezke grabaziorako."
-AMF.H264.Usage.Transcoding="Kodeketa"
-AMF.H264.Usage.UltraLowLatency="Latentzia oso txikia"
-AMF.H264.Usage.LowLatency="Latentzia txikia"
-AMF.H264.QualityPreset="Aurrezarritako kalitatea"
-AMF.H264.QualityPreset.Speed="Abiadura"
-AMF.H264.QualityPreset.Balanced="Orekatua"
-AMF.H264.QualityPreset.Quality="Kalitatea"
-AMF.H264.Profile="Profila"
-AMF.H264.ProfileLevel="Profilaren maila"
-AMF.H264.ProfileLevel.Description="H.264 profilaren zein maila erabili behar da kodetzeko:\n- 'Automatic' automatikoki kalkulatzen du emandako abiadura eta fotogramen tamainarako egokiena,\n- '4.1'-ek onartzen du 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2'-k onartzen du 1920x1080 60FPS, 1280x720 120FPS\n- '5.0'-k onartzen du 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1'-k onartzen du 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2'-k onartzen du 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Emaria kontrolatzeko metodoa"
-AMF.H264.RateControlMethod.CQP="Konstantea QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Bit emari konstantea (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Bit emari aldakorra (gailur mugatuak) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Bit emari aldakorra (Latentzia mugatua) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Bit emari helburua"
-AMF.H264.Bitrate.Peak="Gehienezko gailurra"
-AMF.H264.QP.Minimum="Gutxieneko QP"
-AMF.H264.QP.Maximum="Gehienezko QP"
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.VBVBuffer="VBV bufferra"
-AMF.H264.VBVBuffer.Strictness="VBV bufferraren zorroztasuna"
-AMF.H264.VBVBuffer.Size="VBV bufferraren tamaina"
-AMF.H264.VBVBuffer.Fullness="VBV bufferraren betetasuna"
-AMF.H264.FillerData="Datu betegarria"
-AMF.H264.FrameSkipping="Fotogramen saltoa"
-AMF.H264.EnforceHRDCompatibility="Behartu HRD bateragarritasuna"
-AMF.H264.KeyframeInterval="Gako fotogramen tartea"
-AMF.H264.IDRPeriod="IDR periodoa"
-AMF.H264.DeblockingFilter="Desblokeoko iragazkia"
-AMF.H264.ScanType="Eskaneatze mota"
-AMF.H264.ScanType.Description="Erabili behar den eskaneatze metodoa, utzi beti '\@AMF.H264.ScanType.Progressive\@'."
-AMF.H264.ScanType.Progressive="Progresiboa"
-AMF.H264.ScanType.Interlaced="Gurutzelarkatua"
-AMF.H264.MotionEstimation="Mugimenduaren estimazioa"
-AMF.H264.MotionEstimation.None="Ezer ez"
-AMF.H264.MotionEstimation.Half="Pixel erdia"
-AMF.H264.MotionEstimation.Quarter="Pixel laurdena"
-AMF.H264.MotionEstimation.Both="Pixel erdia eta laurdena"
-AMF.H264.CodingType="Kodetze mota"
+Utility.Default="Lehenetsia"
+Utility.Automatic="Automatikoa"
+Utility.Manual="Eskuz"
+Utility.Switch.Disabled="Ezgaituta"
+Utility.Switch.Enabled="Gaituta"
+Preset="Aurrezarrita"
+Preset.ResetToDefaults="Berrezarri balio lehenetsiak"
+Preset.Recording="Grabatzen"
+Preset.HighQuality="Kalitate handia"
+Preset.Indistinguishable="Sumaezina"
+Preset.Lossless="Galerarik gabe"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Erabilpena"
+Usage.Transcoding="Transkodetzen"
+Usage.UltraLowLatency="Latentzia ultra-txikia"
+Usage.LowLatency="Latentzia txikia"
+Usage.Webcam="Web-kamera"
+QualityPreset="Aurrezarritako kalitatea"
+QualityPreset.Speed="Abiadura"
+QualityPreset.Balanced="Orekatua"
+QualityPreset.Quality="Kalitatea"
+Profile="Profila"
+Profile.Description="Zein profila erabili nahi duzu kodetzeko, laguntza zabalduenetik kalitate handienera ordenatuta."
+ProfileLevel="Profil maila"
+ProfileLevel.Description="Zein profil maila erabili nahi duzu kodetzeko, gomendatzen da uztea \@Utility.Automatic\@"
 AMF.H264.MaximumLTRFrames="Gehienezko LTR fotogramak"
 AMF.H264.MaximumAccessUnitSize="Sarbide unitatearen gehienezko tamaina"
 AMF.H264.HeaderInsertionSpacing="Goiburuak txertatzeko tartea"
 AMF.H264.WaitForTask.Description="Ezezaguna, esperimentala"
-AMF.H264.PreAnalysisPass.Description="Ezezaguna, esperimentala"
-AMF.H264.VBAQ.Description="Ezezaguna, esperimentala"
-AMF.H264.GOPSize.Description="Ezezaguna, esperimentala"
-AMF.H264.GOPAlignment.Description="Ezezaguna, esperimentala"
-AMF.H264.MaximumReferenceFrames.Description="Ezezaguna, esperimentala"
 AMF.H264.SlicesPerFrame="Zatiak fotogramako"
 AMF.H264.SliceMode.Description="Ezezaguna, esperimentala"
 AMF.H264.MaximumSliceSize.Description="Ezezaguna, esperimentala"
 AMF.H264.SliceControlMode.Description="Ezezaguna, esperimentala"
 AMF.H264.SliceControlSize.Description="Ezezaguna, esperimentala"
 AMF.H264.IntraRefresh.NumberOfStripes.Description="Ezezaguna, esperimentala"
-AMF.H264.VideoAPI="Bideo APIa"
-AMF.H264.VideoAPI.Description="Zein API erabili kodeketarako."
-AMF.H264.VideoAdapter="Bideo egokigailua"
-AMF.H264.VideoAdapter.Description="Zein egokigailu erabili kodeketarako."
-AMF.H264.OpenCL="OpenCL"
-AMF.H264.OpenCL.Description="Kodetzaileak OpenCL erabili behar du banakako fotogramak bidaltzeko?"
-AMF.H264.View="Ikuspegia"
-AMF.H264.View.Description="Zein propietate ikusi behar dira. Ez duzu laguntzarik jasoko 'Aditu' edo 'Maisu' ikuspegian."
-AMF.H264.View.Basic="Oinarrizkoa"
-AMF.H264.View.Advanced="Aurreratua"
-AMF.H264.View.Expert="Aditu"
-AMF.H264.View.Master="Maixu"
-AMF.H264.Debug="Garbiketa"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/fi-FI.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/fi-FI.ini Changed

@@ -1,53 +1,155 @@
-AMF.Util.Default="Oletusarvo"
-AMF.Util.Automatic="Automaattinen"
-AMF.Util.Manual="Manuaalinen"
-AMF.Util.Toggle.Disabled="Pois käytöstä"
-AMF.Util.Toggle.Enabled="Käytössä"
-AMF.H264.Preset="Esiasetus"
-AMF.H264.Preset.ResetToDefaults="Palauta oletukset"
-AMF.H264.Preset.Recording="Tallennus"
-AMF.H264.Preset.HighQuality="Korkea laatu"
-AMF.H264.Preset.Indistinguishable="Erottamaton"
-AMF.H264.Preset.Lossless="Häviötön"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Käyttö"
-AMF.H264.Usage.Transcoding="Transkoodaus"
-AMF.H264.Usage.UltraLowLatency="Erittäin alhainen latenssi"
-AMF.H264.Usage.LowLatency="Alhainen latenssi"
-AMF.H264.QualityPreset="Laatuasetus"
-AMF.H264.QualityPreset.Speed="Nopeus"
-AMF.H264.QualityPreset.Balanced="Tasapainotettu"
-AMF.H264.QualityPreset.Quality="Laatu"
-AMF.H264.Profile="Profiili"
-AMF.H264.ProfileLevel="Profiilin taso"
-AMF.H264.RateControlMethod="Rate Control -tapa"
-AMF.H264.RateControlMethod.CQP="Pysyvä QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Jatkuva bitrate (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Vaihteleva bitrate (Piikkiin sidottu) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Vaihteleva bitrate (Latenssiin sidottu) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Bitrate-tavoite"
-AMF.H264.Bitrate.Peak="Bitrate-piikki"
-AMF.H264.QP.Minimum="Minimi QP"
-AMF.H264.QP.Maximum="Maksimi QP"
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.VBVBuffer="VBV-puskuri"
-AMF.H264.VBVBuffer.Size="VBV-puskurin koko"
-AMF.H264.FillerData="Täyttödata"
-AMF.H264.FrameSkipping="Ruudun ohitus"
-AMF.H264.EnforceHRDCompatibility="Pakota HRD-yhteensopivuus"
-AMF.H264.DeblockingFilter="Deblocking filtteri"
-AMF.H264.ScanType="Skannaustyyppi"
-AMF.H264.ScanType.Progressive="Progressiivinen"
-AMF.H264.ScanType.Interlaced="Lomitettu"
-AMF.H264.MotionEstimation="Liikkeen ennakointi"
-AMF.H264.MotionEstimation.None="Ei mitään"
-AMF.H264.View="Näyttötila"
-AMF.H264.View.Basic="Yksinkertainen"
-AMF.H264.View.Advanced="Kehittynyt"
-AMF.H264.View.Expert="Expertti"
-AMF.H264.View.Master="Jumalallinen"
-AMF.H264.Debug="Debug"
+Utility.Default="Oletusarvo"
+Utility.Automatic="Automaattinen"
+Utility.Manual="Manuaalinen"
+Utility.Switch.Disabled="Pois käytöstä"
+Utility.Switch.Enabled="Käytössä"
+Preset="Esiasetus"
+Preset.ResetToDefaults="Palauta oletukset"
+Preset.Recording="Tallennus"
+Preset.HighQuality="Korkea laatu"
+Preset.Indistinguishable="Erottamaton"
+Preset.Lossless="Häviötön"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Käyttö"
+Usage.Description="Mihin käyttöön AMF säädetään:\n- \"\@Usage.Transcoding\@\" on yleiseen käyttöön soveltuva transkooderi (suositeltu),\n- \"\@Usage.UltraLowLatency\@\" on todella matalan viiveen enkoodaukseen,\n- \"\@Usage.LowLatency\@\" on vastaavanlainen ylemmän kanssa, mutta hieman suuremmalla viiveellä.\nSuora lähettäminen tukee pelkästään \"\@Usage.Transcoding\@\", muita arvoja voidaan käyttää tallentamiseen."
+Usage.Transcoding="Transkoodaus"
+Usage.UltraLowLatency="Erittäin alhainen latenssi"
+Usage.LowLatency="Alhainen latenssi"
+Usage.Webcam="Web-kamera"
+QualityPreset="Laatuasetus"
+QualityPreset.Description="Minkä laadun esiasetusta AMF asetetaan tavoittelemaan:\n- \"\@QualityPreset.Speed\@\" on nopein, mutta huonoimmalla laadulla,\n- \"\@QualityPreset.Balanced\@\" on tasapainotettu sekoitus molempia,\n- \"\@QualityPreset.Quality\@\" antaa parhaan laadun annetulle bitratelle."
+QualityPreset.Speed="Nopeus"
+QualityPreset.Balanced="Tasapainotettu"
+QualityPreset.Quality="Laatu"
+Profile="Profiili"
+Profile.Description="Mitä profiilia käytetään enkoodaukseen. Lajiteltuna parhaiten tuetusta (yläosa) parhaaseen laatuun (alaosa)."
+ProfileLevel="Profiilin taso"
+ProfileLevel.Description="Mitä profiilin tasoa käytetään. Tämä on parasta jättää \@Utility.Automatic\@."
+Tier="Tier -taso"
+Tier.Description="Millä tier tasolla enkoodataan. \"High\" pyrkii korkean bitraten/siirtonopeuden käyttöön ja \"Main\" sen sijaan on suunnattu yleiseen mediaan."
+AspectRatio="Kuvasuhde"
+AspectRatio.Description="Mikä kuvasuhde kirjataan kohdetiedostoon."
+CodingType="Koodaustyyppi"
+CodingType.Description="Millaista koodausta käytetään:\n* \"\@Utility.Automatic\@\" antaa AMF:n päättää (suositeltu).\n* \"CALVC\" (Context-Adaptive Variable-Length Coding) on nopeampi, mutta vie enemmän tilaa.\n* \"CABAC\" (Context-Adaptive Binary Arithmetic Coding) on hitaampi, mutta vie vähemmän tilaa."
+MaximumReferenceFrames="Referenssi framejen enimmäismäärä"
+MaximumReferenceFrames.Description="Montako framea enkooderi voi referoida enintään enkoodatessa, asetuksella on suora vaikutus enkoodauksen laatuun."
+RateControlMethod="Rate Control -tapa"
+RateControlMethod.Description="Mitä rate control tapaa käytetään:\n- \"\@RateControlMethod.CQP\@\" käyttää kiinteitä I-/P-/B-Frame QP arvoja,\n- \"\@RateControlMethod.CBR\@\" pysyttelee annetussa kohde-bitratessa (käyttäen täytedataa) (suositeltu suoraan lähetykseen),\n- \"\@RateControlMethod.VBR\@\" pysyttelee annetun korkeimman bitraten alla,\n- \"\@RateControlMethod.VBRLAT\@\" pysyttelee lähellä kohde bitratea, mikäli GPU viive ja kuormitus antaa myöten, muussa tapauksessa käyttää korkeampaa bitratea (suositeltu tallentamiseen)."
+RateControlMethod.CQP="Jatkuva QP (CQP)"
+RateControlMethod.CBR="Jatkuva bitrate (CBR)"
+RateControlMethod.VBR="Vaihteleva bitrate (Piikkiin sidottu) (VBR)"
+RateControlMethod.VBRLAT="Vaihteleva bitrate (Latenssiin sidottu) (VBRLAT)"
+PrePassMode="Pre-Pass -tila"
+PrePassMode.Description="Pre-Pass on toissijainen bitraten jaottelun läpikäynti, joka mahdollistaa paremman bitraten jaottelun ketjussa, vaikutus voi kuitenkin vaihdella eri korteilla."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (neljännesosa)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (puolikas)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (kokonainen)"
+Bitrate.Target="Bitrate-tavoite"
+Bitrate.Target.Description="Bitrate johon tähdätään kokonaisketjussa."
+Bitrate.Peak="Bitrate-piikki"
+Bitrate.Peak.Description="Korkein bitrate johon tähdätään kokonaisketjussa."
+QP.IFrame="I-Frame QP"
+QP.IFrame.Description="Kiinteä QP-arvo I-frameille."
+QP.PFrame="P-Frame QP"
+QP.PFrame.Description="Kiinteä QP-arvo P-frameille."
+QP.BFrame="B-Frame QP"
+QP.BFrame.Description="Kiinteä QP-arvo B-frameille."
+QP.Minimum="Matalin QP"
+QP.Minimum.Description="Matalin QP-arvo frameille."
+QP.IFrame.Minimum="Matalin I-Frame QP"
+QP.IFrame.Minimum.Description="Matalin QP-arvo I-frameille."
+QP.PFrame.Minimum="Matalin P-Frame QP"
+QP.PFrame.Minimum.Description="Matalin QP-arvo P-frameille."
+QP.Maximum="Korkein QP"
+QP.Maximum.Description="Korkein QP-arvo frameille."
+QP.IFrame.Maximum="Korkein I-Frame QP"
+QP.IFrame.Maximum.Description="Korkein QP-arvo I-frameille."
+QP.PFrame.Maximum="Korkein P-Frame QP"
+QP.PFrame.Maximum.Description="Korkein QP-arvo P-frameille."
+FillerData="Täytedata"
+FillerData.Description="Täytedatan käyttöönotolla enkooderi pitää vähintään \@Bitrate.Target\@ täyttämällä jäljelle jääneen tilan ketjussa tyhjällä informaatiolla."
+FrameSkipping="Frame-ohitus"
+FrameSkipping.Description="Ruutujen ohituksella enkooderi voi pudottaa frameja täyttääkseen \@Bitrate.Target\@ vaatimukset.\nPudottaessaan framen enkooderi syöttää sen sijaan toistetun viimeisen NAL -framen striimiin.\nVoi auttaa jos käytössä on erittäin matala \@Bitrate.Target\@ vaatimus."
+VBAQ="VBAQ"
+VBAQ.Description="Ota käyttöön \"Variance Based Adaptive Quantization\" (VBAQ) joka pohjautuu pikselien vaihteluun bitraten jakamisen helpottamiseksi.\nSe toimii idealla jossa ihmissilmä on herkempi kuvan virheille tasaisissa kohdissa, jolloin bitrate kohdistetaan näille alueille.\nKäyttämällä tätä laatu saattaa parantua tietynlaista sisältöä näytettäessä."
+EnforceHRD="Pakota HRD"
+EnforceHRD.Description="Pakota hypoteettisen referenssi dekooderin käyttö, jota käytetään varmistamaan, että ulostulon bittistriimi on oikea."
+VBVBuffer="VBV-puskuri"
+VBVBuffer.Description="Mitä tapaa käytetään määrittämään VBV puskurin koko:\n- \"\@Utility.Automatic\@\" laskee koon käyttäen täsmällistä rajausta,\n- \"\@Utlity.Manual\@\" antaa käyttäjän ohjata kokoa.\nVBV (Video Buffering Verifier) puskuria käytetään joissakin Rate Control tavoissa pitämään kokonaisbitrate annettujen rajojen sisällä."
+VBVBuffer.Strictness="VBV-puskurin tiukkuus"
+VBVBuffer.Strictness.Description="Määrittelee VBV puskurin tiukkuuden, 100% on niin tarkka kuin mahdollista ja 0% on rajoittamaton."
+VBVBuffer.Size="VBV-puskurin koko"
+VBVBuffer.Size.Description="VBV-puskurin koko jota käytetään ketjussa bitraten säädössä."
+VBVBuffer.InitialFullness="VBV-puskurin alustava täysinäisyys"
+VBVBuffer.InitialFullness.Description="VBV-puskurin alustavan täysinäisyyden suuruus (%), vaikuttaa vain alustavaan enkoodausketjuun."
+KeyframeInterval="Keyframe -väli"
+KeyframeInterval.Description="Aikaväli (sekunteina) keyframejen välissä."
+H264.IDRPeriod="IDR-ajanjakso (frameina)"
+H264.IDRPeriod.Description="Määrittää etäisyyden Instantaneous Decoding Refreshes (IDR) välillä frameissa. Säätää myös GOP-ketjun kokoa."
+H265.IDRPeriod="IDR-ajanjakso (GOP)"
+H265.IDRPeriod.Description="Määrittää etäisyyden Instantaneous Decoding Refreshes (IDR) välillä GOP:seissa."
+GOP.Type="GOP-tyyppi"
+GOP.Type.Description="Millaista GOP-tyyppiä käytetään:\n- \"\@GOP.Type.Fixed\@\" käyttää aina kiinteää väliä jokaisen GOP:n välillä.\n- \"\@GOP.Type.Variable\@\" sallii eri kokoisia GOP-arvoja, tarpeesta riippuen.\n\"\@GOP.Type.Fixed\@\" on kuinka H264 toteutus toimii ja on paras paikallisen verkon suoralähetyksessä, kunnes taas \"\@GOP.Type.Variable\@\" on paras pienikokoiseen korkealaatuiseen tallentamiseen."
+GOP.Type.Fixed="Kiinteä"
+GOP.Type.Variable="Muuttuva"
+GOP.Size="GOP-koko"
+GOP.Size.Description="GOP:n (Group Of Pictures) koko frameissa."
+GOP.Size.Minimum="Matalin GOP koko"
+GOP.Size.Minimum.Description="Pienin GOP (Group of Pictures) koko frameissa."
+GOP.Size.Maximum="Suurin GOP koko"
+GOP.Size.Maximum.Description="Suurin GOP (Group of Pictures) koko frameissa."
+GOP.Alignment="GOP kohdistus"
+GOP.Alignment.Description="Kokeellinen, vaikutuksia ei ole tiedossa. Käytä omalla vastuullasi."
+BFrame.Pattern="B-Frame kuvio"
+BFrame.Pattern.Description="Käytettävien B-Framejen määrä enkoodauksessa.\nTuettu 2. ja 3. sukupolven VCE korteissa. Negatiivinen vaikutus enkoodauksen suorituskykyyn."
+BFrame.DeltaQP="B-Frame Delta QP"
+BFrame.DeltaQP.Description="Delta QP arvo viimeiseen I- tai P-Frameen ei-referoitavissa oleville B-Frameille."
+BFrame.Reference="B-Frame referenssi"
+BFrame.Reference.Description="Salli B-Framejen käyttää myös toisia B-Frameja referenssinä pelkkien P- ja I-Framejen sijasta."
+BFrame.ReferenceDeltaQP="B-Frame referenssi Delta QP"
+BFrame.ReferenceDeltaQP.Description="Delta QP arvo viimeiseen I- tai P-Frameen referoitavissa oleville B-Frameille."
+DeblockingFilter="Deblocking suodatin"
+DeblockingFilter.Description="Salli dekooderin käyttää Deblocking suodatinta."
+MotionEstimation="Liikkeen arviointi"
+MotionEstimation.Description="Liikkeen arviointi mahdollistaa enkooderin vähentää tarvittavaa bitratea arvioimalla pikselin kulkusuunnan."
+MotionEstimation.Quarter="Neljännes-pikseli"
+MotionEstimation.Half="Puoli-pikseli"
+MotionEstimation.Full="Neljännes- & Puolikas-pikseli"
+Video.API="Video API"
+Video.API.Description="Mitä APIa käytetään backendillä?"
+Video.Adapter="Näytönohjain"
+Video.Adapter.Description="Millä näytönohjaimella yritetään enkoodata?"
+OpenCL="OpenCL"
+OpenCL.Description="Käytetäänkö OpenCL:ää framejen toimittamiseen? Teknisesti nopeampi, mutta aiheuttaa ongelmia Intelin ajurien kanssa (Epäyhteensopivien OpenCL kirjastojen kanssa)."
+View="Katselutila"
+View.Description="Mitä ominaisuuksia näytetään?\nKäyttämällä \"\@View.Master\@\" menetät oikeutesi saada tukea."
+View.Basic="Yksinkertainen"
+View.Advanced="Kehittynyt"
+View.Expert="Expertti"
+View.Master="Mestarillinen"
+Debug="Debug"
+Debug.Description="Ota käyttöön lisää debuggaus viestejä. Vaatii Open Broadcaster Software Studion käynnistämisen komentorivillä \"--verbose --log_unfiltered\" (ilman heittomerkkejä)."
+AMF.H264.MaximumLTRFrames="Maksimimäärä LTR frameja"
+AMF.H264.MaximumLTRFrames.Description="Pitkäaikaiset referenssi framet (LTR) on ominaisuus, jolla enkooderi voi merkitä tiettyjä frameja ketjussa referoitaviksi pitemmän aikaa.\nLTR frameja ei voida käyttää B-Framejen kanssa ja enkooderi ottaa B-Framet pois käytöstä mikäli ne ovat käytössä."
+AMF.H264.MaximumAccessUnitSize="Maksimi Access Unit koko"
+AMF.H264.MaximumAccessUnitSize.Description="Suurin Access Unit koko NAL:lle."
+AMF.H264.HeaderInsertionSpacing="Header Insertion Spacing"
+AMF.H264.HeaderInsertionSpacing.Description="How many frames should be between NAL headers."
+AMF.H264.WaitForTask="Wait For Task"
+AMF.H264.WaitForTask.Description="Unknown, Experimental"
+AMF.H264.SlicesPerFrame="Slices Per Frame"
+AMF.H264.SlicesPerFrame.Description="How many I-Frame slices should be stored with each frame?\nA value of zero lets the encoder decide on the fly.\nIntra-Refresh encoding is used for faster playback and seeking."
+AMF.H264.SliceMode="Slice Mode"
+AMF.H264.SliceMode.Description="Unknown, Experimental"
+AMF.H264.MaximumSliceSize="Maximum Slice Size"
+AMF.H264.MaximumSliceSize.Description="Unknown, Experimental"
+AMF.H264.SliceControlMode="Slice Control Mode"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/fr-FR.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/fr-FR.ini Changed

@@ -1,81 +1,44 @@
-AMF.Util.Default="Défaut"
-AMF.Util.Automatic="Automatique"
-AMF.Util.Manual="Manuel"
-AMF.Util.Toggle.Disabled="Désactivé"
-AMF.Util.Toggle.Enabled="Activé"
-AMF.H264.Preset="Préréglage"
-AMF.H264.Preset.ResetToDefaults="Valeurs par défaut"
-AMF.H264.Preset.Recording="Enregistrement"
-AMF.H264.Preset.HighQuality="Qualité élevée"
-AMF.H264.Preset.Indistinguishable="Indifférenciable"
-AMF.H264.Preset.Lossless="Sans pertes"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Mode"
-AMF.H264.Usage.Description="Le mode d'optimisation utilisé par AMF :\n- '\@AMF.H264.Usage.Transcoding\@' : utilisation pour du transcodage (réglage recommandé),\n- '\@AMF.H264.Usage.UltraLowLatency\@' : encodage à très faible latence,\n- '\@AMF.H264.Usage.LowLatency\@' : quasiment identique au réglage ci-dessus, avec une latence légèrement plus élevée.\nLe streaming n'est possible qu'en mode '\@AMF.H264.Usage.Transcoding\@', l'enregistrement est possible avec tous les autres modes."
-AMF.H264.Usage.Transcoding="Transcodage"
-AMF.H264.Usage.UltraLowLatency="Très faible latence"
-AMF.H264.Usage.LowLatency="Faible latence"
-AMF.H264.QualityPreset="Préréglages de qualité"
-AMF.H264.QualityPreset.Description="Le préréglage de qualité qu'AMF doit cibler :\n- \"\@AMF.H264.QualityPreset.Speed\@\" est le plus rapide, au détriment d'une qualité déplorable,\n- \"\@AMF.H264.QualityPreset.Balanced\@\" est un compromis entre \"\@AMF.H264.QualityPreset.Speed\@\" et \"\@AMF.H264.QualityPreset.Quality\@\",\n- \"\@AMF.H264.QualityPreset.Quality\@\" délivre la meilleure qualité pour un débit donné."
-AMF.H264.QualityPreset.Speed="Vitesse"
-AMF.H264.QualityPreset.Balanced="Equilibré"
-AMF.H264.QualityPreset.Quality="Qualité"
-AMF.H264.Profile="Profil"
-AMF.H264.Profile.Description="Le profil H.264 utilisé pour l'encodage :\n- 'Baseline' est compatible avec la majorité des lecteurs,\n-'Main' est compatible avec les lecteurs d'ancienne génération (recommandé pour les lecteurs mobiles),\n- 'High' est compatible avec la plupart des lecteurs récents (réglage recommandé pour la plupart des cas)."
-AMF.H264.ProfileLevel="Niveau de profil"
-AMF.H264.ProfileLevel.Description="Quel niveau de profil H.264 utiliser pour l'encodage :\n- \"Automatique\" laisse l'encodeur déterminer le meilleur profil en fonction de la résolution d'image et du nombre d'images par seconde.\n- \"4.1\" supporte les formats suivants : 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- \"4.2\" supporte les formats suivants : 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- \"5.0\" supporte les formats suivants : 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- \"5.1\" supporte les formats suivants : 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- \"5.2\" supporte les formats suivants : 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Méthode de contrôle du débit"
-AMF.H264.RateControlMethod.CQP="QP constant (CQP)"
-AMF.H264.RateControlMethod.CBR="Débit constant (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Débit Variable (maximum) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Débit Variable (latence limitée) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Débit cible"
-AMF.H264.Bitrate.Target.Description="Le débit de données sortantes que l'encodeur va essayer de respecter pendant l'encodage."
-AMF.H264.Bitrate.Peak="Débit maximal"
-AMF.H264.Bitrate.Peak.Description="Le débit de données sortantes que l'encodeur va essayer de respecter pendant l'encodage."
-AMF.H264.QP.Minimum="QP minimal"
-AMF.H264.QP.Maximum="QP maximal"
-AMF.H264.QP.IFrame="QP I-Frame"
-AMF.H264.QP.PFrame="QP P-Frame"
-AMF.H264.QP.BFrame="QP B-Frame"
-AMF.H264.VBVBuffer="Tampon VBV"
-AMF.H264.VBVBuffer.Description="Quelle méthode utiliser pour déterminer la taille du tampon VBV :\n- \"\@AMF.Util.Automatic\@\" calcule la taille en fonction de la valeur de respect du tampon,\n- \"\@AMF.Util.Manual\@\" laisse le choix de la taille à l'utilisateur.\nLe tampon VBV (Video Buffering Verifier) est utilisé par certaines méthodes de contrôle du débit pour assurer au mieux le respect des contraintes données."
-AMF.H264.VBVBuffer.Strictness="Respect du tampon VBV"
-AMF.H264.VBVBuffer.Size="Taille du tampon VBV"
-AMF.H264.VBVBuffer.Fullness="Remplissage du tampon VBV"
-AMF.H264.FillerData="Données de remplissage"
-AMF.H264.FrameSkipping="Saut d'images"
-AMF.H264.EnforceHRDCompatibility="Appliquer la compatibilité avec l'HRD"
-AMF.H264.KeyframeInterval="Intervalle d'images-clé"
-AMF.H264.IDRPeriod="Périodicité des trames IDR"
-AMF.H264.DeblockingFilter="Filtre de dégroupage"
-AMF.H264.ScanType="Balayage"
-AMF.H264.ScanType.Description="La méthode de balayage à utiliser (laissez cette valeur sur \"\@AMF.H264.ScanType.Progressive\@\")."
-AMF.H264.ScanType.Progressive="Progressif"
-AMF.H264.ScanType.Interlaced="Entrelacé"
-AMF.H264.MotionEstimation="Estimation de mouvement"
-AMF.H264.MotionEstimation.Description="L'estimation du mouvement permet à l'encodeur de réduire le débit en calculant le déplacement des pixels."
-AMF.H264.MotionEstimation.None="Aucun"
-AMF.H264.MotionEstimation.Half="Demi-pixel"
-AMF.H264.MotionEstimation.Quarter="Quart de pixel"
-AMF.H264.MotionEstimation.Both="Demi-pixel & quart de pixel"
-AMF.H264.CodingType="Type de codage"
-AMF.H264.CodingType.Description="Le type de codage à utiliser:\n* \"\@AMF.Util.Default\@\" : laisser AMF décider (recommandé).\n* CALVC (Context-Adaptive Variable-Length Coding) est rapide mais lourd.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) est lent mais léger."
+Utility.Default="Défaut"
+Utility.Automatic="Automatique"
+Utility.Manual="Manuel"
+Utility.Switch.Disabled="Désactivé"
+Utility.Switch.Enabled="Activé"
+Preset="Pré-réglage"
+Preset.ResetToDefaults="Valeurs par défaut"
+Preset.Recording="Enregistrement"
+Preset.HighQuality="Qualité élevée"
+Preset.Indistinguishable="Indifférenciable"
+Preset.Lossless="Sans pertes"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Usage"
+Usage.Transcoding="Transcodage"
+Usage.UltraLowLatency="Très faible latence"
+Usage.LowLatency="Faible latence"
+Usage.Webcam="Webcam"
+QualityPreset="Préréglages de qualité"
+QualityPreset.Speed="Vitesse"
+QualityPreset.Balanced="Equilibré"
+QualityPreset.Quality="Qualité"
+Profile="Profil"
+ProfileLevel="Niveau de profil"
+Tier="Palier"
+AspectRatio="Ratio de l'image"
+MotionEstimation.Half="Demi-pixel"
+Video.API="API vidéo"
+Video.Adapter="Périphérique vidéo"
+View.Basic="Basique"
+View.Advanced="Avancé"
+View.Expert="Expert"
+View.Master="Master"
+Debug="Débogage"
 AMF.H264.MaximumLTRFrames="Maximum de trames LTR"
 AMF.H264.MaximumAccessUnitSize="Taille max. d'une Access Unit"
 AMF.H264.MaximumAccessUnitSize.Description="Taille maximale d’une unité d’accès pour un NAL. Une valeur de 0 permet à l’encodeur de choisir le meilleur."
 AMF.H264.HeaderInsertionSpacing="Intervalle d'insertion de l'en-tête de stream"
 AMF.H264.SlicesPerFrame="Tranches par image"
-AMF.H264.VideoAPI="API vidéo"
-AMF.H264.VideoAdapter="Périphérique vidéo"
-AMF.H264.OpenCL="OpenCL"
-AMF.H264.View="Mode de visualisation"
-AMF.H264.View.Description="Quels paramètres afficher ?\nChoisir '\@AMF.H264.View.Master\@' est réservé aux utilisateurs avancés, et vous exclus d'office de toute possibilité d'assistance de la part du développeur."
-AMF.H264.View.Basic="Basique"
-AMF.H264.View.Advanced="Avancé"
-AMF.H264.View.Expert="Expert"
-AMF.H264.View.Master="Maître"
-AMF.H264.Debug="Débogage"
-AMF.H264.Debug.Description="Activer le débogage avancé dans le fichier journal (dans le cas où vous souhaitez solliciter une assistance auprès du développeur de l'encodeur)."
+AMF.H264.SliceMode.Description="Inconnu, expérimental"
+AMF.H264.MaximumSliceSize.Description="Inconnu, expérimental"
+AMF.H264.SliceControlMode.Description="Inconnu, expérimental"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Inconnu, expérimental"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/hu-HU.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/hu-HU.ini Changed

@@ -1,92 +1,117 @@
-AMF.Util.Default="Alapértelmezett"
-AMF.Util.Automatic="Automatikus"
-AMF.Util.Manual="Manuális"
-AMF.Util.Toggle.Disabled="Letiltva"
-AMF.Util.Toggle.Enabled="Engedélyezve"
-AMF.H264.Preset="Készlet"
-AMF.H264.Preset.ResetToDefaults="Alapértelmezett beállítások visszaállítása"
-AMF.H264.Preset.Recording="Felvétel"
-AMF.H264.Preset.HighQuality="Kiváló minőség"
-AMF.H264.Preset.Indistinguishable="Megkülönböztethetetlen"
-AMF.H264.Preset.Lossless="Veszteségmentes"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Használat"
-AMF.H264.Usage.Transcoding="Transzkódolás"
-AMF.H264.Usage.UltraLowLatency="Nagyon alacsony késleltesésű"
-AMF.H264.Usage.LowLatency="Alacsony késleltetésű"
-AMF.H264.QualityPreset="Minőségi profil"
-AMF.H264.QualityPreset.Speed="Gyors"
-AMF.H264.QualityPreset.Balanced="Kiegyenlített"
-AMF.H264.QualityPreset.Quality="Minőségi"
-AMF.H264.Profile="Enkóder profil"
-AMF.H264.Profile.Description="Mely H.264 Profilt használja kódoláshoz:\n- 'Baseline' a legnagyobb platform támogatottsággal,\n- 'Main' a régebbi eszközök támogatják (ajánlott ha mobil eszköz tulajdonosokat céloz meg),\n- 'High' a jelenlegi eszközök támogatják (ajánlott)."
-AMF.H264.ProfileLevel="Profil szint"
-AMF.H264.RateControlMethod="Bitráta vezérlés"
-AMF.H264.RateControlMethod.CQP="Erőltetett QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Konstans bitsebesség (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Változó bitsebesség (Csúcsértéket betartva) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Változó bitsebesség (Késleltetés kényszerítése) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Célbitsebesség"
-AMF.H264.Bitrate.Target.Description="Bitráta amelyet szeretne elérni a konvertálás során."
-AMF.H264.Bitrate.Peak="Csúcs bitsebesség"
-AMF.H264.Bitrate.Peak.Description="Bitsebesség amelyet maximálisan elérhet a konvertálás során."
-AMF.H264.QP.Minimum="Minimum QP"
-AMF.H264.QP.Minimum.Description="Legalacsonyabb QP (Quantization Parameter) képkockában használható érték."
-AMF.H264.QP.Maximum="Maximum QP"
-AMF.H264.QP.Maximum.Description="Legmagasabb QP (Quantization Parameter) képkockában használható érték."
-AMF.H264.QP.IFrame="I-Képkocka QP"
-AMF.H264.QP.IFrame.Description="Rögzített QP érték az I képkockák használatához."
-AMF.H264.QP.PFrame="P-Képkocka QP"
-AMF.H264.QP.PFrame.Description="Rögzített QP érték a P képkockák használatához."
-AMF.H264.QP.BFrame="B-Képkocka QP"
-AMF.H264.QP.BFrame.Description="Rögzített QP (Quantization Parameter) érték a B-Képkockák használatához."
-AMF.H264.VBVBuffer="VBV puffer"
-AMF.H264.VBVBuffer.Strictness="VBV Puffer kötöttség"
-AMF.H264.VBVBuffer.Strictness.Description="Meghatározza a VBV puffer szigorúságát, 100% esetén teljesen pontos és 0% esetén kötetlen."
-AMF.H264.VBVBuffer.Size="VBV pufferméret"
-AMF.H264.VBVBuffer.Fullness="VBV puffer telítettség"
-AMF.H264.FillerData="Filler adat"
-AMF.H264.FrameSkipping="Képkocka kihagyás"
-AMF.H264.EnforceHRDCompatibility="HRD Kompatibilitás kényszerítése"
-AMF.H264.KeyframeInterval="Kulcsképkocka időköze"
-AMF.H264.IDRPeriod="IDR időköz"
-AMF.H264.BFrame.Pattern="B képkocka"
-AMF.H264.BFrame.Pattern.Description="A B képkockák száma kódolás közben.\nA második és harmadik generációjú VCE kártyák támogatják. Hátráltató hatása van a kódolás teljesítményére."
-AMF.H264.BFrame.DeltaQP="B képkocka Delta QP"
-AMF.H264.BFrame.DeltaQP.Description="Delta QP érték az utolsó I vagy P képkocka nem referenciálható B képkockáihoz."
-AMF.H264.BFrame.Reference="Referenciálható B képkockák"
-AMF.H264.BFrame.Reference.Description="Lehetővé teszi a B képkockák számára, hogy B képkockát referenciaként használjon, P és I képkockák helyett."
-AMF.H264.BFrame.ReferenceDeltaQP="Delta QP a referenciálható B kockákhoz"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Delta QP érték az utolsó I vagy P képkockának a referenciálható B képkockákhoz."
-AMF.H264.DeblockingFilter="Deblocking Filter"
-AMF.H264.ScanType="Rögzítés módja"
-AMF.H264.ScanType.Progressive="Progresszív"
-AMF.H264.ScanType.Interlaced="Váltottsoros (Kísérleti)"
-AMF.H264.MotionEstimation="Mozgásbecslés"
-AMF.H264.MotionEstimation.Description="Mozdulat becslés lehetővé teszi a kódolónak, hogy csökkentse a bitsebesség követelményt a pixel elmozdulásának a felbecsülésével."
-AMF.H264.MotionEstimation.None="Semmi"
-AMF.H264.MotionEstimation.Half="Fél-pixel"
-AMF.H264.MotionEstimation.Quarter="Negyed-pixel"
-AMF.H264.MotionEstimation.Both="Fél-&negyed-pixel"
-AMF.H264.CodingType="Kódolás típusa"
+Utility.Default="Alapértelmezett"
+Utility.Automatic="Automatikus"
+Utility.Manual="Manuális"
+Utility.Switch.Disabled="Letiltva"
+Utility.Switch.Enabled="Engedélyezve"
+Preset="Sablon"
+Preset.ResetToDefaults="Alapértelmezett beállítások visszaállítása"
+Preset.Recording="Felvétel"
+Preset.HighQuality="Jó minőség"
+Preset.Indistinguishable="Megkülönböztethetetlen"
+Preset.Lossless="Veszteségmentes"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Használat"
+Usage.Transcoding="Átkódolás"
+Usage.UltraLowLatency="Nagyon alacsony késleltetés"
+Usage.LowLatency="Alacsony késleltetés"
+Usage.Webcam="Webkamera"
+QualityPreset="Minőségi profil"
+QualityPreset.Speed="Sebesség"
+QualityPreset.Balanced="Kiegyensúlyozott"
+QualityPreset.Quality="Minőségi"
+Profile="Profil"
+ProfileLevel="Profil szint"
+Tier="Szint"
+AspectRatio="Képarány"
+CodingType="Kódolás típusa"
+MaximumReferenceFrames="Maximális referencia képkockák"
+RateControlMethod="Sebességvezérlési metódus"
+RateControlMethod.CQP="Állandó QP (CQP)"
+RateControlMethod.CBR="Konstans bitsebesség (CBR)"
+RateControlMethod.VBR="Változó bitsebesség (Csúcsértéket betartva) (VBR)"
+RateControlMethod.VBRLAT="Változó bitsebesség (Késleltetés kényszerítése) (VBRLAT)"
+Bitrate.Target="Célbitsebesség"
+Bitrate.Target.Description="Bitsebesség, amelyet megkísérel elérni a szekvencia során."
+Bitrate.Peak="Csúcs bitsebesség"
+Bitrate.Peak.Description="Bitsebesség amelyet maximálisan elérhet a szekvencia során."
+QP.IFrame="I-Képkocka QP"
+QP.IFrame.Description="Rögzített QP érték az I képkockák használatához."
+QP.PFrame="P-Képkocka QP"
+QP.PFrame.Description="Rögzített QP érték a P képkockák használatához."
+QP.BFrame="B-Képkocka QP"
+QP.BFrame.Description="Rögzített QP érték az B képkockák használatához."
+QP.Minimum="Minimum QP"
+QP.Minimum.Description="Képkockában legalacsonyabb használható QP érték."
+QP.IFrame.Minimum="Minimális I-Képkocka QP"
+QP.IFrame.Minimum.Description="I-Képkockában legalacsonyabb használható QP érték."
+QP.PFrame.Minimum="Minimális I-Képkocka QP"
+QP.PFrame.Minimum.Description="P-Képkockában legalacsonyabb használható QP érték."
+QP.Maximum="Maximum QP"
+QP.Maximum.Description="Képkockában legnagyobb használható QP érték."
+QP.IFrame.Maximum="Maximális I-Képkocka QP"
+QP.IFrame.Maximum.Description="I-Képkockában legnagyobb használható QP érték."
+QP.PFrame.Maximum="Maximális P-Képkocka QP"
+QP.PFrame.Maximum.Description="P-Képkockában legnagyobb használható QP érték."
+FillerData="Kitöltőadat"
+FrameSkipping="Képkocka kihagyás"
+VBAQ="VBAQ"
+EnforceHRD="HRD kényszerítése"
+VBVBuffer="VBV puffer"
+VBVBuffer.Strictness="VBV Puffer kötöttség"
+VBVBuffer.Strictness.Description="Meghatározza a VBV puffer szigorúságát, 100% esetén teljesen pontos és 0% esetén kötetlen."
+VBVBuffer.Size="VBV pufferméret"
+VBVBuffer.Size.Description="A VBV puffer mérete, amely a bitsebesség vezérléshez használatos a szekvenciában."
+VBVBuffer.InitialFullness="VBV puffer kezdeti telítettség"
+KeyframeInterval="Kulcsképkocka időköze"
+KeyframeInterval.Description="A kulcsképkockák közötti időköz (másodpercben)."
+H264.IDRPeriod="IDR idő (Képkockákban)"
+H264.IDRPeriod.Description="Meghatározza a távolságot két pillanatnyi dekódoló frissítő (IDR) között a képkockákban. A GOP szekvencia méretét is szabályozza."
+H265.IDRPeriod="IDR idő (GOP-okban)"
+GOP.Type="GOP típusa"
+GOP.Type.Fixed="Rögzített"
+GOP.Type.Variable="Változó"
+GOP.Size="GOP méret"
+GOP.Size.Minimum="GOP méretminimum"
+GOP.Size.Minimum.Description="Minimális GOP (képek csoportja) méret keretekben."
+GOP.Size.Maximum="GOP méretmaximum"
+GOP.Size.Maximum.Description="Maximális GOP (képek csoportja) méret keretekben."
+GOP.Alignment="GOP igazítás"
+GOP.Alignment.Description="Kísérleti, hatása ismeretlen. Csak saját felelősségére használja."
+BFrame.Pattern="B-képkockaminta"
+BFrame.Pattern.Description="A B képkockák száma kódolás közben.\nA második és harmadik generációjú VCE kártyák támogatják. Hátráltató hatása van a kódolás teljesítményére."
+BFrame.DeltaQP="B-képkocka Delta QP"
+BFrame.DeltaQP.Description="Delta QP érték az utolsó I vagy P képkocka nem referenciálható B képkockáihoz."
+BFrame.Reference="Referencia B-Képkocka"
+BFrame.Reference.Description="Lehetővé teszi a B képkockák számára, hogy B képkockát referenciaként használjon, P és I képkockák helyett."
+BFrame.ReferenceDeltaQP="B-képkocka referencia Delta QP"
+BFrame.ReferenceDeltaQP.Description="Delta QP érték az utolsó I vagy P képkockának a referenciálható B képkockákhoz."
+DeblockingFilter="Deblocking szűrő"
+DeblockingFilter.Description="Lehetővé teszi a dekódernek, hogy Deblocking szűrőt alkalmazzon."
+MotionEstimation="Mozgásbecslés"
+MotionEstimation.Description="Mozdulat becslés lehetővé teszi a kódolónak, hogy csökkentse a bitsebesség követelményt a pixel elmozdulásának a felbecsülésével."
+MotionEstimation.Quarter="Negyedpixel"
+MotionEstimation.Half="Félpixel"
+MotionEstimation.Full="Negyed és félpixel"
+Video.API="Videó API"
+Video.Adapter="Videó adapter"
+Video.Adapter.Description="Milyen Adapteren történjen a kódolás?"
+OpenCL="OpenCL"
+View="Nézet mód"
+View.Basic="Alap"
+View.Advanced="Haladó"
+View.Expert="Szakértő"
+View.Master="Mester"
+Debug="Hibakeresés"
 AMF.H264.MaximumLTRFrames="Maximális LTR képkocka"
 AMF.H264.MaximumAccessUnitSize="Hozzáférési egység maximális mérete"
 AMF.H264.MaximumAccessUnitSize.Description="NAL számára a legnagyobb elérési egység."
+AMF.H264.HeaderInsertionSpacing="Fejléc beszúrási térköz"
 AMF.H264.HeaderInsertionSpacing.Description="NAL fejlécek közötti képkockák száma."
 AMF.H264.WaitForTask="Feladatra várakozás"
 AMF.H264.WaitForTask.Description="Ismeretlen, kísérleti"
-AMF.H264.PreAnalysisPass="Elemzés előtti fázis"
-AMF.H264.PreAnalysisPass.Description="Ismeretlen, kísérleti"
-AMF.H264.VBAQ="VBAQ"
-AMF.H264.VBAQ.Description="Ismeretlen, kísérleti"
-AMF.H264.GOPSize="GOP méret"
-AMF.H264.GOPSize.Description="Ismeretlen, kísérleti"
-AMF.H264.GOPAlignment="GOP igazítás"
-AMF.H264.GOPAlignment.Description="Ismeretlen, kísérleti"
-AMF.H264.MaximumReferenceFrames="Maximális referencia képkockák"
-AMF.H264.MaximumReferenceFrames.Description="Ismeretlen, kísérleti"
 AMF.H264.SlicesPerFrame="Szeletelés képkockánként"
+AMF.H264.SlicesPerFrame.Description="Mennyi I-Képkocka szelet tárolható egyes képkockán?\nA zéró érték hagyja a kódolót menet közben dönteni.\nAz Intra-frissítési kódolás a gyorsabb lejátszáshoz és kereséshez használható."
 AMF.H264.SliceMode="Szelet mód"
 AMF.H264.SliceMode.Description="Ismeretlen, kísérleti"
 AMF.H264.MaximumSliceSize="Maximális szeletméret"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/it-IT.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/it-IT.ini Changed

@@ -1,85 +1,15 @@
-AMF.Util.Default="Predefinito"
-AMF.Util.Automatic="Automatico"
-AMF.Util.Manual="Manuale"
-AMF.Util.Toggle.Disabled="Disabilitato"
-AMF.Util.Toggle.Enabled="Attivo"
-AMF.H264.Preset="Preset"
-AMF.H264.Preset.ResetToDefaults="Ripristina a Predefiniti"
-AMF.H264.Preset.Recording="Registrazione"
-AMF.H264.Preset.HighQuality="Alta Qualità"
-AMF.H264.Preset.Indistinguishable="Indistinguibili"
-AMF.H264.Preset.Lossless="Lossless"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Utilizzo"
-AMF.H264.Usage.Transcoding="Transcodifica"
-AMF.H264.Usage.UltraLowLatency="Latenza ultra bassa"
-AMF.H264.Usage.LowLatency="Bassa latenza"
-AMF.H264.QualityPreset="Qualità Preset"
-AMF.H264.QualityPreset.Speed="Velocità"
-AMF.H264.QualityPreset.Balanced="Bilanciato"
-AMF.H264.QualityPreset.Quality="Qualità"
-AMF.H264.Profile="Profilo"
-AMF.H264.ProfileLevel="Livello profilo"
-AMF.H264.ProfileLevel.Description="Quale livello di profilo H.264 usare per l'encoding:\n- 'Automatico' calcola il miglior livello per il dato Frame Rate e Frame Size,\n- '4.1' supporta 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' supporta 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' supporta 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' supporta 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' supporta 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Metodo di controllo della frequenza"
-AMF.H264.RateControlMethod.CQP="QP Costante (QPC)"
-AMF.H264.RateControlMethod.CBR="Bitrate costante (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Bitrate Variabile (Peak Constrained) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Bitrate variabile (latenza vincolata) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Bitrate di destinazione"
-AMF.H264.Bitrate.Peak="Picco Bitrate"
-AMF.H264.QP.Minimum="QP Minimo"
-AMF.H264.QP.Minimum.Description="Valore QP più basso da utilizzare in un Frame."
-AMF.H264.QP.Maximum="QP Massimo"
-AMF.H264.QP.Maximum.Description="Valore QP più alto da utilizzare in un Frame."
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.VBVBuffer="Buffer VBV"
-AMF.H264.VBVBuffer.Strictness="Strettezza Buffer VBV"
-AMF.H264.VBVBuffer.Size="Dimensione Buffer VBV"
-AMF.H264.VBVBuffer.Fullness="Larghezza Buffer VBV"
-AMF.H264.FillerData="Dati di riempimento"
-AMF.H264.FrameSkipping="Frame Skipping"
-AMF.H264.EnforceHRDCompatibility="Forza compatibilità HRD"
-AMF.H264.KeyframeInterval="Intervallo Keyframe"
-AMF.H264.IDRPeriod="Periodo IDR"
-AMF.H264.DeblockingFilter="Filtro di deblock"
-AMF.H264.ScanType="Tipo di scansione"
-AMF.H264.ScanType.Progressive="Progressivo"
-AMF.H264.ScanType.Interlaced="Interlacciato"
-AMF.H264.MotionEstimation="Stima Movimento"
-AMF.H264.MotionEstimation.None="Nessuno"
-AMF.H264.MotionEstimation.Half="Metà-Pixel"
-AMF.H264.MotionEstimation.Quarter="Quarto-Pixel"
-AMF.H264.MotionEstimation.Both="Meta- & Quarto-Pixel"
-AMF.H264.CodingType="Tipo di codifica"
 AMF.H264.MaximumLTRFrames="Fotogrammi LTR Massimi"
 AMF.H264.MaximumAccessUnitSize="Massima dimensione di unità d'accesso"
 AMF.H264.HeaderInsertionSpacing="Spaziatura di inserimento di intestazione"
 AMF.H264.WaitForTask="Attendere per attività"
 AMF.H264.WaitForTask.Description="Sconosciuto, sperimentale"
-AMF.H264.PreAnalysisPass="Analisi pre-pass"
-AMF.H264.PreAnalysisPass.Description="Sconosciuto, sperimentale"
-AMF.H264.VBAQ="VBAQ"
-AMF.H264.VBAQ.Description="Sconosciuto, sperimentale"
-AMF.H264.GOPSize="Dimensione del GOP"
-AMF.H264.GOPSize.Description="Sconosciuto, sperimentale"
-AMF.H264.GOPAlignment="Allineamento del GOP"
-AMF.H264.GOPAlignment.Description="Sconosciuto, sperimentale"
-AMF.H264.MaximumReferenceFrames="Numero massimo di frames di riferimento"
-AMF.H264.MaximumReferenceFrames.Description="Sconosciuto, sperimentale"
 AMF.H264.SlicesPerFrame="Slices Per Frame"
 AMF.H264.SliceMode="Modalità Slice"
 AMF.H264.SliceMode.Description="Sconosciuto, sperimentale"
 AMF.H264.MaximumSliceSize="Dimensione massima frame"
 AMF.H264.MaximumSliceSize.Description="Sconosciuto, sperimentale"
 AMF.H264.SliceControlMode="Modalità di controllo Slice"
-AMF.H264.View="Modalità di visualizzazione"
-AMF.H264.View.Basic="Basico"
-AMF.H264.View.Advanced="Avanzate"
-AMF.H264.View.Expert="Esperto"
-AMF.H264.View.Master="Master"
-AMF.H264.Debug="Debug"
+AMF.H264.SliceControlMode.Description="Sconosciuto, sperimentale"
+AMF.H264.SliceControlSize.Description="Sconosciuto, sperimentale"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Sconosciuto, sperimentale"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/ja-JP.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/ja-JP.ini Changed

@@ -1,90 +1,135 @@
-AMF.Util.Default="既定値"
-AMF.Util.Automatic="自動"
-AMF.Util.Manual="手動"
-AMF.Util.Toggle.Disabled="無効"
-AMF.Util.Toggle.Enabled="有効"
-AMF.H264.Preset="プリセット"
-AMF.H264.Preset.ResetToDefaults="既定値に戻す"
-AMF.H264.Preset.Recording="録画中"
-AMF.H264.Preset.HighQuality="高品質"
-AMF.H264.Preset.Indistinguishable="区別不能品質"
-AMF.H264.Preset.Lossless="無損失品質"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="用途"
-AMF.H264.Usage.Description="AMFの使用方法:\n- '\@AMF.H264.Usage.Transcoding\@' は汎用のトランスコード (推奨) で、\n- '\@AMF.H264.Usage.UltraLowLatency\@' は超低遅延エンコード用で、\n- '\@AMF.H264.Usage.LowLatency\@' は上記と似ていますが少し遅延があります。\n配信は '\@AMF.H264.Usage.Transcoding\@' のみをサポートし、他のすべての値は録画で使用できます。"
-AMF.H264.Usage.Transcoding="変換"
-AMF.H264.Usage.UltraLowLatency="超低遅延"
-AMF.H264.Usage.LowLatency="低遅延"
-AMF.H264.QualityPreset="品質プリセット"
-AMF.H264.QualityPreset.Description="どの品質プリセットをAMFが目標とするか:\n- '\@AMF.H264.QualityPreset.Speed\@' は最速ですが品質は最悪で、\n- '\@AMF.H264.QualityPreset.Balanced\@' は両方のバランスの取れた組み合わせで、\n- '\@AMF.H264.QualityPreset.Quality\@' は指定されたビットレートに対して最高の品質を提供します。"
-AMF.H264.QualityPreset.Speed="速度"
-AMF.H264.QualityPreset.Balanced="バランス"
-AMF.H264.QualityPreset.Quality="品質"
-AMF.H264.Profile="プロファイル"
-AMF.H264.Profile.Description="エンコードに使用するH.264プロファイル:\n- 'Baseline' はプラットフォームごとのサポートが最も大きく、\n- 'Main' は古いデバイスでもサポートされ、(モバイルデバイスがターゲットなら推奨)\n- 'High' は現在主流のデバイスでサポートされています。(推奨)"
-AMF.H264.ProfileLevel="プロファイルレベル"
-AMF.H264.ProfileLevel.Description="エンコードに使用する H.264 プロファイルレベル:\n- '自動' は与えられたフレームレートと解像度に対して最適なプロファイルレベルを計算し、\n- '4.1' は 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS をサポートし、\n- '4.2' は 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS をサポートし、\n- '5.0' は 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS をサポートし、\n- '5.1' は 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS をサポートし、\n- '5.2' は 3840x2160 60FPS、1920 x 1080 172FPS, 1280 x 720 172FPS, 960 x 540 172FPS をサポートします。"
-AMF.H264.RateControlMethod="レート制御方式"
-AMF.H264.RateControlMethod.Description="どのレート制御方法を使用すべきか:\n- '\@AMF.H264.RateControlMethod.CQP\@' は固定I-/P-/B-フレームQP (量子化パラメータ) の値を割り当て、\n- '\@AMF.H264.RateControlMethod.CBR\@' は指定された目標ビットレート (フィラーデータを使用) に留まり (配信に推奨)、\n- '\@AMF.H264.RateControlMethod.VBR\@' は指定されたピークビットレート以下にとどまり、\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' はGPU遅延と負荷が許可されている場合は目標ビットレートに近く、それ以外の場合はより高いビットレートを使用します (録画に推奨)。"
-AMF.H264.RateControlMethod.CQP="固定QP (CQP)"
-AMF.H264.RateControlMethod.CBR="固定ビットレート (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="可変ビットレート (ピーク制約) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="可変ビットレート (遅延制約) (VBR_LAT)"
-AMF.H264.Bitrate.Target="目標ビットレート"
-AMF.H264.Bitrate.Target.Description="全体的なシーケンスで達成しようとするビットレート。"
-AMF.H264.Bitrate.Peak="最大ビットレート"
-AMF.H264.Bitrate.Peak.Description="全体的なシーケンスでピークを最大にしようとするビットレート。"
-AMF.H264.QP.Minimum="最小QP"
-AMF.H264.QP.Minimum.Description="フレームで使用する最低 QP (量子化パラメーター) の値です。"
-AMF.H264.QP.Maximum="最大QP"
-AMF.H264.QP.Maximum.Description="フレームで使用する最高 QP (量子化パラメーター) の値です。"
-AMF.H264.QP.IFrame="I-フレーム QP"
-AMF.H264.QP.IFrame.Description="I-フレームに使用する固定 QP の値。"
-AMF.H264.QP.PFrame="P-フレーム QP"
-AMF.H264.QP.PFrame.Description="P-フレームに使用する固定 QP の値。"
-AMF.H264.QP.BFrame="B-フレーム QP"
-AMF.H264.QP.BFrame.Description="B-フレームに対して使用する固定 QP (量子化パラメーター) の値です。"
-AMF.H264.VBVBuffer="VBV バッファ"
-AMF.H264.VBVBuffer.Description="どの方法を使用してVBVバッファーサイズを決定する必要があるか:\n- '\@AMF.Util.Automatic\@' は厳密性制約を使用してサイズを計算し、\n- '\@AMF.Util.Manual\@' はユーザーがサイズを制御できるようにします。\nVBV (ビデオバッファリングベリファイア) バッファは特定のレート制御方法により指定された制約内で全体のビットレートを保持するために使用されます。"
-AMF.H264.VBVBuffer.Strictness="VBV バッファ厳密性"
-AMF.H264.VBVBuffer.Strictness.Description="VBV バッファーの厳密さを決定し、100％は可能な限り厳密で0％は制限されません。"
-AMF.H264.VBVBuffer.Size="VBV バッファサイズ"
-AMF.H264.VBVBuffer.Size.Description="シーケンスにおけるビットレート制御のために使用されている VBV バッファーのサイズ。"
-AMF.H264.VBVBuffer.Fullness="VBV バッファ充満"
-AMF.H264.VBVBuffer.Fullness.Description="VBVバッファーの初期状態は、エンコーディングの初期シーケンスにのみ影響します。"
-AMF.H264.FillerData="フィラーデータ"
-AMF.H264.FillerData.Description="フィラーデータを有効にするとエンコーダは空の情報でシーケンスの残りのスペースを埋めることによって少なくともターゲットビットレートを維持することができます。"
-AMF.H264.FrameSkipping="フレームスキップ"
-AMF.H264.FrameSkipping.Description="フレームスキッピングはエンコーダが目標ビットレート要件を満たすためにフレームをドロップすることを可能にする。\nエンコーダがフレームを落とすときに代わりにリピートラストフレームNALをストリームに挿入する。\n目標ビットレートが非常に低い場合に役立ちます。"
-AMF.H264.EnforceHRDCompatibility="HRD 互換性を強制"
-AMF.H264.EnforceHRDCompatibility.Description="フレーム内の最大QP値の変化を制限する仮説的参照デコーダの制限を強制します。\n録画や配信には非推奨で参照ソフトウェアデコーダのみを持つ非常に古いデバイスをターゲットにする場合にのみ使用してください。"
-AMF.H264.KeyframeInterval="キーフレーム間隔"
-AMF.H264.KeyframeInterval.Description="ドロップ不可能なフレーム間の秒数。\nGOPのサイズも制御します。"
-AMF.H264.IDRPeriod="IDR 周期"
-AMF.H264.IDRPeriod.Description="フレーム内の瞬時デコードリフレッシュ (IDR) 間の距離を定義します。 GOP-シーケンスのサイズも制御します。"
-AMF.H264.BFrame.Pattern="B-フレーム"
-AMF.H264.BFrame.Pattern.Description="エンコードに使用するBフレームの数。\n第2世代および第3世代のVCEカードでサポートされています。 エンコーディングのパフォーマンスに悪影響を与えます。"
-AMF.H264.BFrame.DeltaQP="B-フレーム デルタ QP"
-AMF.H264.BFrame.DeltaQP.Description="参照不可能なB-フレームに対する最後のI-フレームまたはP-フレームまでのデルタ QP の値。"
-AMF.H264.BFrame.Reference="参照可能 B-フレーム"
-AMF.H264.BFrame.Reference.Description="B-フレームはP-フレームとI-フレームだけでなく、B-フレームも参照として使用できます。"
-AMF.H264.BFrame.ReferenceDeltaQP="参照可能 B-フレーム デルタ QP"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="参照可能なB-フレームに対する最後のI-フレームまたはP-フレームまでのデルタ QP の値。"
-AMF.H264.DeblockingFilter="デブロックフィルタ"
-AMF.H264.DeblockingFilter.Description="デコーダがエンコードされたストリームに対してデブロックフィルタの使用を許可されているかのフラグを設定します。"
-AMF.H264.ScanType="スキャンの種類"
-AMF.H264.ScanType.Description="どのスキャン方法が使用されるか、'プログレッシブ'を常にこのままにしておきます。"
-AMF.H264.ScanType.Progressive="プログレッシブ"
-AMF.H264.ScanType.Interlaced="インターレース"
-AMF.H264.MotionEstimation="動き推定"
-AMF.H264.MotionEstimation.Description="動き推定はピクセルがどこに移動したかを推定することによってエンコーダが必要とするビットレートを削減します。"
-AMF.H264.MotionEstimation.None="未設定"
-AMF.H264.MotionEstimation.Half="1/2ピクセル"
-AMF.H264.MotionEstimation.Quarter="1/4ピクセル"
-AMF.H264.MotionEstimation.Both="ハーフ & クォーターピクセル"
-AMF.H264.CodingType="コーディングの種類"
-AMF.H264.CodingType.Description="使用するコーディングの種類:\n* \@AMF.Util.Default\@ AMFが決定します。(推奨)\n* CALVC (Context-Adaptive Variable-Length Coding) は高速ですが、容量は大きいです。\n* CABAC (Context-Adaptive Binary Arithmetic Coding) は低速ですが、容量は小さくなります。"
+Utility.Default="既定値"
+Utility.Automatic="自動"
+Utility.Manual="手動"
+Utility.Switch.Disabled="無効"
+Utility.Switch.Enabled="有効"
+Preset="プリセット"
+Preset.ResetToDefaults="既定値に戻す"
+Preset.Recording="録画中"
+Preset.HighQuality="高品質"
+Preset.Indistinguishable="区別不能品質"
+Preset.Lossless="無損失品質"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="用途"
+Usage.Description="AMFの使用方法:\n- '\@Usage.Transcoding\@' は汎用のトランスコード (推奨) で、\n- '\@Usage.UltraLowLatency\@' は超低遅延エンコード用で、\n- '\@Usage.LowLatency\@' は上記と似ていますが少し遅延があります。\n配信は '\@Usage.Transcoding\@' のみをサポートし、他のすべての値は録画で使用できます。"
+Usage.Transcoding="変換"
+Usage.UltraLowLatency="超低遅延"
+Usage.LowLatency="低遅延"
+Usage.Webcam="ウェブカメラ"
+QualityPreset="品質プリセット"
+QualityPreset.Description="どの品質プリセットをAMFが目標とするか:\n- '\@QualityPreset.Speed\@' は最速ですが品質は最悪で、\n- '\@QualityPreset.Balanced\@' は両方のバランスの取れた組み合わせで、\n- '\@QualityPreset.Quality\@' は指定されたビットレートに対して最高の品質を提供します。"
+QualityPreset.Speed="速度"
+QualityPreset.Balanced="バランス"
+QualityPreset.Quality="品質"
+Profile="プロファイル"
+Profile.Description="エンコードに使用するプロファイル。最もサポートが広いもの (上) から最も品質が高いもの (下) まで。"
+ProfileLevel="プロファイルレベル"
+ProfileLevel.Description="エンコードに使用するプロファイルレベル。\@Utility.Automatic\@ のままにするのが最善です。"
+Tier="階層"
+Tier.Description="どの階層でエンコードするか。'High' は高いビットレート/帯域幅の利用を対象とし、'Main' は主流メディアを対象とします。"
+AspectRatio="アスペクト比"
+AspectRatio.Description="どのアスペクト比が出力ファイルに書き込まれるべきか。"
+CodingType="コーディングの種類"
+CodingType.Description="使用するコーディングの種類:\n* \@Utility.Automatic\@ AMFが決定します。(推奨)\n* CALVC (Context-Adaptive Variable-Length Coding) は高速ですが、容量は大きいです。\n* CABAC (Context-Adaptive Binary Arithmetic Coding) は低速ですが、容量は小さくなります。"
+MaximumReferenceFrames="最大参照フレーム数"
+MaximumReferenceFrames.Description="エンコード時にエンコーダが参照できるフレームの最大数は、エンコーディングの質に直接影響します。"
+RateControlMethod="レート制御方式"
+RateControlMethod.Description="どのレート制御方法を使用すべきか:\n- '\@RateControlMethod.CQP\@' は固定I-/P-/B-フレーム QP の値を割り当て、\n- '\@RateControlMethod.CBR\@' は指定された目標ビットレート (フィラーデータを使用) に留まり (配信に推奨)、\n- '\@RateControlMethod.VBR\@' は指定されたピークビットレート以下にとどまり、\n- '\@RateControlMethod.VBRLAT\@' はGPU遅延と負荷が許可されている場合は目標ビットレートに近く、それ以外の場合はより高いビットレートを使用します (録画に推奨)。"
+RateControlMethod.CQP="固定QP (CQP)"
+RateControlMethod.CBR="固定ビットレート (CBR)"
+RateControlMethod.VBR="可変ビットレート (ピーク制約) (VBR)"
+RateControlMethod.VBRLAT="可変ビットレート (遅延制約) (VBRLAT)"
+PrePassMode="プレパスモード"
+PrePassMode.Description="プレパスはシーケンス内のビットレートのより良い配分を可能にする二次的なビットレート配分パスですが、この効果はカードによって異なる場合があります。"
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (4分の1サイズ)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (2分の1サイズ)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (フルサイズ)"
+Bitrate.Target="目標ビットレート"
+Bitrate.Target.Description="全体的なシーケンスで達成しようとするビットレート。"
+Bitrate.Peak="最大ビットレート"
+Bitrate.Peak.Description="全体的なシーケンスでピークを最大にしようとするビットレート。"
+QP.IFrame="I-フレーム QP"
+QP.IFrame.Description="I-フレームに使用する固定 QP の値。"
+QP.PFrame="P-フレーム QP"
+QP.PFrame.Description="P-フレームに使用する固定 QP の値。"
+QP.BFrame="B-フレーム QP"
+QP.BFrame.Description="B-フレームに使用する固定 QP の値。"
+QP.Minimum="最小QP"
+QP.Minimum.Description="フレームで使用する最低の QP 値。"
+QP.IFrame.Minimum="最小 I-フレーム QP"
+QP.IFrame.Minimum.Description="I-フレームで使用する QP の最低値。"
+QP.PFrame.Minimum="最小 P-フレーム QP"
+QP.PFrame.Minimum.Description="P-フレームで使用する QP の最低値。"
+QP.Maximum="最大QP"
+QP.Maximum.Description="フレームで使用する最高の QP 値。"
+QP.IFrame.Maximum="最大 I-フレーム QP"
+QP.IFrame.Maximum.Description="I-フレームで使用する QP の最高値。"
+QP.PFrame.Maximum="最大 P-フレーム QP"
+QP.PFrame.Maximum.Description="P-フレームで使用する QP の最高値。"
+FillerData="フィラーデータ"
+FillerData.Description="フィラーデータを有効にするとエンコーダは空の情報で残りのスペースを埋めることによって少なくとも \@Bitrate.Target\@ を維持することができます。"
+FrameSkipping="フレームスキップ"
+FrameSkipping.Description="フレームスキッピングはエンコーダが \@Bitrate.Target\@ 要件を満たすためにフレームをドロップすることを可能にします。\nエンコーダがフレームを落とすときに代わりにリピートラストフレームNALをストリームに挿入します。\n \@Bitrate.Target\@ 要件が非常に低い場合に役立ちます。"
+VBAQ="VBAQ"
+VBAQ.Description="ピクセルの分散に基づいてビットレートをより良く分配する '分散に基づく適応型量子化' (VBAQ) の使用を有効にします。\n人間の視覚系が高度なテクスチャ領域のアーチファクトに対して敏感でないという考え方に基づきビットレート配分をより滑らかな表面に向けることができます。\nこれを有効にすると特定のコンテンツの主観的品質が向上する可能性があります。"
+EnforceHRD="HRD を強制"
+EnforceHRD.Description="出力ビットストリームが正確であることを確認するために使用される仮説的参照デコーダの使用を強制します。"
+VBVBuffer="VBV バッファ"
+VBVBuffer.Description="VBV バッファサイズの決定方法:\n- '\@Utlity.Automatic\@' は厳密性制約を使用してサイズを計算し、\n- '\@Utlity.Manual\@' は利用者がサイズを制御できるようにします。\nVBV バッファ (ビデオバッファリングベリファイア) は特定のレート制御方法により指定された制約内で全体のビットレートを保持するために使用されます。"
+VBVBuffer.Strictness="VBV バッファ厳密性"
+VBVBuffer.Strictness.Description="VBV バッファーの厳密さを決定し、100％は可能な限り厳密で0％は制限されません。"
+VBVBuffer.Size="VBV バッファサイズ"
+VBVBuffer.Size.Description="シーケンスにおけるビットレート制御のために使用されている VBV バッファーのサイズ。"
+VBVBuffer.InitialFullness="VBV バッファ初期充満"
+VBVBuffer.InitialFullness.Description="VBV バッファの初期充足率 (%) がどの程度か、エンコードの初期シーケンスにのみ影響します。"
+KeyframeInterval="キーフレーム間隔"
+KeyframeInterval.Description="キーフレーム同士の間隔(秒単位)。"
+H264.IDRPeriod="IDR 周期 (フレーム数)"
+H264.IDRPeriod.Description="フレーム内の瞬時デコードリフレッシュ (IDR) 間の距離を定義します。 GOP-シーケンスのサイズも制御します。"
+H265.IDRPeriod="IDR 周期 (GOP数)"
+H265.IDRPeriod.Description="GOP内の瞬時デコードリフレッシュ (IDR) 間の距離を定義します。"
+GOP.Type="GOP 型"
+GOP.Type.Description="使用する GOP 型:\n - '\@GOP.Type.Fixed\@' 常にそれぞれの GOP 間の固定距離を使用。\n '\@GOP.Type.Variable\@' 必要に応じて、さまざまなサイズの Gop が使用されます。\n'\@GOP.Type.Fixed\@' はH264の実装方法次第でローカルネットワーク配信に最適で、一方 ' \@GOP.Type.Variable\@' はサイズ小さいの高品質の録画に最適です。"
+GOP.Type.Fixed="固定"
+GOP.Type.Variable="可変"
+GOP.Size="GOP サイズ"
+GOP.Size.Description="フレームの GOP (画像グループ) のサイズ。"
+GOP.Size.Minimum="GOP サイズの最小値"
+GOP.Size.Minimum.Description="フレームの GOP (画像グループ) の最小サイズ。"
+GOP.Size.Maximum="GOP サイズの最大値"
+GOP.Size.Maximum.Description="フレームの GOP (画像グループ) の最大サイズ。"
+GOP.Alignment="GOP 配置"
+GOP.Alignment.Description="実験的で、効果は不明です。自己責任で使用してください。"
+BFrame.Pattern="B-フレームパターン"
+BFrame.Pattern.Description="エンコード時に使用するBフレームの数。\n第2世代および第3世代のVCEカードでサポートされています。 エンコード時のパフォーマンスに悪影響を与えます。"
+BFrame.DeltaQP="B-フレームデルタ QP"
+BFrame.DeltaQP.Description="参照不可能なB-フレームに対する最後のI-フレームまたはP-フレームまでのデルタ QP の値。"
+BFrame.Reference="B-フレーム参照"
+BFrame.Reference.Description="B-フレームはP-フレームとI-フレームだけでなく、B-フレームも参照として使用できます。"
+BFrame.ReferenceDeltaQP="B-フレーム参照デルタ QP"
+BFrame.ReferenceDeltaQP.Description="参照可能なB-フレームに対する最後のI-フレームまたはP-フレームまでのデルタ QP の値。"
+DeblockingFilter="デブロックフィルタ"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/ko-KR.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/ko-KR.ini Changed

@@ -1,90 +1,135 @@
-AMF.Util.Default="기본값"
-AMF.Util.Automatic="자동"
-AMF.Util.Manual="수동"
-AMF.Util.Toggle.Disabled="비활성화"
-AMF.Util.Toggle.Enabled="활성화"
-AMF.H264.Preset="사전 설정"
-AMF.H264.Preset.ResetToDefaults="기본값으로 복구"
-AMF.H264.Preset.Recording="녹화"
-AMF.H264.Preset.HighQuality="우수한 품질"
-AMF.H264.Preset.Indistinguishable="무손실과 거의 구분 불가"
-AMF.H264.Preset.Lossless="무손실"
-AMF.H264.Preset.Twitch="트위치"
-AMF.H264.Preset.YouTube="유튜브"
-AMF.H264.Usage="용도"
-AMF.H264.Usage.Description="용도에 따라 AMF을 조율합니다:\n- '트랜스코딩'은 일반적인 용도에 적합한 설정입니다(추천).\n- '매우 낮은 지연시간'은 아주 낮은 인코딩 레이턴시를 의미합니다.\n- '낮은 지연시간'은 그 수준이 조금 더 높습니다.\n방송 목적으로는 '트랜스코딩'만 지원됩니다. 모든 다른 설정값은 녹화 용도에만 사용됩니다."
-AMF.H264.Usage.Transcoding="트랜스코딩"
-AMF.H264.Usage.UltraLowLatency="매우 낮은 지연 시간"
-AMF.H264.Usage.LowLatency="낮은 지연 시간"
-AMF.H264.QualityPreset="품질 사전 설정"
-AMF.H264.QualityPreset.Description="AMF 품질을 결정할 때 어떤 수준을 목표로 할지 결정합니다:\n-'속도'는 가장 빠르지만, 품질이 가장 나쁘며,\n- '균형'은 '속도'와 '품질' 사이의 수준을 제공합니다.\n- '품질'은 주어진 비트레이트 내에서 가장 뛰어난 품질을 제공합니다."
-AMF.H264.QualityPreset.Speed="속도"
-AMF.H264.QualityPreset.Balanced="균형"
-AMF.H264.QualityPreset.Quality="품질"
-AMF.H264.Profile="프로파일"
-AMF.H264.Profile.Description="인코딩에 사용할 H.264 프로파일을 선택합니다:\n- 'Baseline'은 지원하는 플랫폼이 가장 많습니다,\n- 'Main'은 비교적 오래된 장치에서 지원합니다. (모바일 장치를 대상으로 한다면 추천하는 설정입니다),\n- 'High'는 현재 장치에서 지원하는 설정입니다 (추천)."
-AMF.H264.ProfileLevel="프로필 수준"
-AMF.H264.ProfileLevel.Description="인코딩으로 사용할 H.264 프로파일 수준을 지정합니다:\n-'자동'은 설정된 프레임과 그 크기에 맞춰 가장 좋은 수준을 계산합니다,\n-'4.1'은 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS을 지원합니다,\n-'4.2'는 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS을 지원합니다,\n- '5.0'은 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS을 지원합니다,\n- '5.1'은 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS을 지원합니다,\n- '5.2'은 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS을 지원합니다."
-AMF.H264.RateControlMethod="속도 제어 방식"
-AMF.H264.RateControlMethod.Description="속도 제어 동작 방식을 설정합니다:\n- '\@AMF.H264.RateControlMethod.CQP\@'는 고정된 I-/P-/B- 프레임 QP (양자화 매개변수) 값을 할당합니다, \n- '\@AMF.H264.RateControlMethod.CBR\@'은 주어진 목표 비트레이트를 유지합니다. (채우기 정보를 사용)(방송에 추천함),\n- '\@AMF.H264.RateControlMethod.VBR\@'은 주어진 최대 비트레이트보다 낮은 수준을 유지합니다,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@'는 GPU의 지연시간과 부하가 허용한다면 목표 비트레이트에 가까운 수준을 유지하며, 그렇지 않은 상황에서는 그보다 높은 비트레이트를 사용합니다. (녹화에 추천)."
-AMF.H264.RateControlMethod.CQP="고정 QP (CQP)"
-AMF.H264.RateControlMethod.CBR="고정 비트레이트 (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="가변 비트레이트 (최대 비트레이트 제약) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="가변 비트레이트(지연율 제약) (VBR_LAT)"
-AMF.H264.Bitrate.Target="목표 비트레이트"
-AMF.H264.Bitrate.Target.Description="전체 장면에서 달성하려는 비트레이트"
-AMF.H264.Bitrate.Peak="최대 비트레이트"
-AMF.H264.Bitrate.Peak.Description="전체 장면에서 달성하려는 비트레이트 최고조"
-AMF.H264.QP.Minimum="최소 QP"
-AMF.H264.QP.Minimum.Description="하나의 프레임에 사용하는 최저 QP (양자화 매개변수) 값"
-AMF.H264.QP.Maximum="최대 QP"
-AMF.H264.QP.Maximum.Description="하나의 프레임에 사용하는 최고 QP (양자화 매개변수) 값"
-AMF.H264.QP.IFrame="I-프레임 QP"
-AMF.H264.QP.IFrame.Description="I-화면에 사용할 고정 QP 값입니다."
-AMF.H264.QP.PFrame="P-프레임 QP"
-AMF.H264.QP.PFrame.Description="P-화면에 사용할 고정 QP 값입니다."
-AMF.H264.QP.BFrame="BP-프레임 QP"
-AMF.H264.QP.BFrame.Description="B-화면에 사용하는 고정 QP (양자화 매개변수) 값."
-AMF.H264.VBVBuffer="VBV 버퍼"
-AMF.H264.VBVBuffer.Description="VBV 버퍼 크기를 결정하는 방식을 설정합니다:\n-'자동'은 엄격도의 제약하에 크기를 계산합니다.\n-'수동'은 사용자가 크기를 조절할 수 있도록 허용합니다.\n일부 특정 속도제어 방식이 사용하는 VBV (Video Buffering Verifier) 버퍼는 제공된 제약 안에서 전반적인 비트레이트를 유지합니다."
-AMF.H264.VBVBuffer.Strictness="VBV 버퍼 엄격도"
-AMF.H264.VBVBuffer.Strictness.Description="VBV 버퍼의 엄격도를 설정합니다. 0%는 제약이 사라지고 100%는 최대한 제한을 합니다."
-AMF.H264.VBVBuffer.Size="VBV 버퍼 크기"
-AMF.H264.VBVBuffer.Size.Description="VBV의 크기는 한 장면의 비트레이트 제어에 사용하는 단위입니다."
-AMF.H264.VBVBuffer.Fullness="VBV 버퍼 충만도"
-AMF.H264.VBVBuffer.Fullness.Description="초기 VBV버퍼가 얼마나 충만한지는 오로지 인코딩의 초반에만 영향을 미칩니다."
-AMF.H264.FillerData="채우기 정보"
-AMF.H264.FillerData.Description="데이터 채우기는 인코더가 한 장면에 남은 공간을 빈 정보로 채워 목표 비트레이트를 유지할 수 있도록 합니다."
-AMF.H264.FrameSkipping="프레임 생략"
-AMF.H264.FrameSkipping.Description="프레임 생략은 인코더가 목표로 하는 비트레이트 요건을 맞추기 위해 프레임을 떨어뜨릴 수 있습니다.\n인코더가 프레임 하나를 떨어뜨리면 마지막 프레임 NAL을 대신 전송합니다.\n목표 비트레이트가 아주 낮을 때 도움이 될 수 있습니다."
-AMF.H264.EnforceHRDCompatibility="HDR 호환모드 적용"
-AMF.H264.EnforceHRDCompatibility.Description="이론적 기본 디코더 강제는 프레임 하나의 최대 QP값 변화를 제한하는 설정입니다.\n녹화나 방송에는 적합하지 않고 기본 소프트웨어 디코더만 사용 가능한 매우 낡은 장치에서 영상을 재생할 때 사용합니다."
-AMF.H264.KeyframeInterval="키프레임 간격"
-AMF.H264.KeyframeInterval.Description="손실이 불가능한 프레임 사이에 얼마나 많은 시간(초)이 필요한지 설정합니다.\n또한 영상(GOP) 크기도 제어합니다."
-AMF.H264.IDRPeriod="IDR 주기"
-AMF.H264.IDRPeriod.Description="프레임 내에서 순간 복호 갱신(nstantaneous Decoding Refreshes) 사이의 거리를 설정합니다. 또한, GOP-장면 크기를 제어합니다."
-AMF.H264.BFrame.Pattern="B-화면"
-AMF.H264.BFrame.Pattern.Description="인코딩에 얼마나 많은 B-화면을 사용할지 설정합니다.\n2, 3세대 VCE카드에서 지원합니다. 인코딩 성능에 부정적인 영향을 줍니다."
-AMF.H264.BFrame.DeltaQP="B-화면 델타 QP"
-AMF.H264.BFrame.DeltaQP.Description="비참조 B-화면에 쓰이는 마지막 I- 혹은P-화면의 델타 QP 값"
-AMF.H264.BFrame.Reference="참조가능한 B-화면"
-AMF.H264.BFrame.Reference.Description="P-와 I-화면뿐만 아니라 B-화면도 참조할 수 있도록 허용합니다."
-AMF.H264.BFrame.ReferenceDeltaQP="참조가능한 B-화면 델타 QP"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="비참조 B-화면에 쓰이는 마지막 I- 혹은P-화면의 델타 QP 값."
-AMF.H264.DeblockingFilter="디블록 필터"
-AMF.H264.DeblockingFilter.Description="디코더가 인코딩된 작업에 디블록 필터를 사용할 수 있도록 허용합니다."
-AMF.H264.ScanType="스캔 형식"
-AMF.H264.ScanType.Description="주사 방식을 설정합니다. 항상 '프로그레시브'로 두십시오."
-AMF.H264.ScanType.Progressive="프로그레시브"
-AMF.H264.ScanType.Interlaced="인터레이스"
-AMF.H264.MotionEstimation="동작 예측"
-AMF.H264.MotionEstimation.Description="동작 추정은 픽셀의 움직임을 추정하여 필요한 비트레이트를 줄일 수 있게 합니다."
-AMF.H264.MotionEstimation.None="없음"
-AMF.H264.MotionEstimation.Half="1/2 화소"
-AMF.H264.MotionEstimation.Quarter="1/4 화소"
-AMF.H264.MotionEstimation.Both="1/2 & 1/4 화소"
-AMF.H264.CodingType="부호화 형식"
-AMF.H264.CodingType.Description="부호화 형식을 결정합니다:\n* \@AMF.Util.Default\@ 은 AMF가 자동으로 선택합니다 (추천).\n* CALVC (문맥기반 적응적 가변길이 부호화) 는 빠르지만, 더 큽니다.\n* CABAC (문맥기반 적응적 이진산술 부호화) 는 느리지만, 더 작습니다."
+Utility.Default="기본값"
+Utility.Automatic="자동"
+Utility.Manual="수동"
+Utility.Switch.Disabled="비활성화"
+Utility.Switch.Enabled="활성화"
+Preset="사전 설정"
+Preset.ResetToDefaults="기본값으로 복구"
+Preset.Recording="녹화 중"
+Preset.HighQuality="우수한 품질"
+Preset.Indistinguishable="무손실과 거의 구분 불가"
+Preset.Lossless="무손실"
+Preset.Twitch="트위치"
+Preset.YouTube="유튜브"
+Usage="용도"
+Usage.Description="용도에 따라 AMF을 조율합니다:\n- '트랜스코딩'은 일반적인 용도에 적합한 설정입니다(추천).\n- '매우 낮은 지연시간'은 아주 낮은 인코딩 레이턴시를 의미합니다.\n- '낮은 지연시간'은 그 수준이 조금 더 높습니다.\n방송 목적으로는 '트랜스코딩'만 지원됩니다. 모든 다른 설정값은 녹화 용도에만 사용됩니다."
+Usage.Transcoding="트랜스코딩"
+Usage.UltraLowLatency="매우 낮은 지연 시간"
+Usage.LowLatency="낮은 지연 시간"
+Usage.Webcam="웹캠"
+QualityPreset="품질 사전 설정"
+QualityPreset.Description="AMF에서 목표로 하는 품질을 설정합니다:\n- '\@QualityPreset.Speed\@' 는 빠르지만 품질이 떨어지는 반면,\n- '\@QualityPreset.Balanced\@' 는 품질과 속도에 균형을 이룹니다.\n- '\@QualityPreset.Quality\@' 는 설정된 비트레이트 안에서 최고의 품질을 제공합니다."
+QualityPreset.Speed="속도"
+QualityPreset.Balanced="균형"
+QualityPreset.Quality="품질"
+Profile="프로파일"
+Profile.Description="인코딩에서 사용할 수 있는 프로파일을 나열했습니다."
+ProfileLevel="프로필 수준"
+ProfileLevel.Description="인코딩에서 사용할 프로필 수준을 결정합니다. \@Utility.Automatic\@로 둘 것을 권장합니다."
+Tier="단계"
+Tier.Description="인코딩에서 사용하는 단계를 설정합니다. Main이 기본 수준입니다. High는 높은 비트레이트를 필요로 하는 용도에 적합합니다."
+AspectRatio="가로세로 비율"
+AspectRatio.Description="출력 파일의 가로 세로 비율을 설정합니다."
+CodingType="부호화 형식"
+CodingType.Description="부호화 형식을 결정합니다:\n* \@AMF.Util.Default\@ 은 AMF가 자동으로 선택합니다 (추천).\n* CALVC (문맥기반 적응적 가변길이 부호화) 는 빠르지만, 더 큽니다.\n* CABAC (문맥기반 적응적 이진산술 부호화) 는 느리지만, 더 작습니다."
+MaximumReferenceFrames="최대 참조 프레임"
+MaximumReferenceFrames.Description="인코더가 얼마나 많은 프레임을 참조할지 설정합니다. 인코딩 품질에 큰 영향을 미칩니다."
+RateControlMethod="속도 제어 방식"
+RateControlMethod.Description="속도 제어 동작 방식을 설정합니다:\n- '\@AMF.H264.RateControlMethod.CQP\@'는 고정된 I-/P-/B- 프레임 QP (양자화 매개변수) 값을 할당합니다, \n- '\@AMF.H264.RateControlMethod.CBR\@'은 주어진 목표 비트레이트를 유지합니다. (채우기 정보를 사용)(방송에 추천함),\n- '\@AMF.H264.RateControlMethod.VBR\@'은 주어진 최대 비트레이트보다 낮은 수준을 유지합니다,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@'는 GPU의 지연시간과 부하가 허용한다면 목표 비트레이트에 가까운 수준을 유지하며, 그렇지 않은 상황에서는 그보다 높은 비트레이트를 사용합니다. (녹화에 추천)."
+RateControlMethod.CQP="고정 QP (CQP)"
+RateControlMethod.CBR="고정 비트레이트 (CBR)"
+RateControlMethod.VBR="가변 비트레이트 (최대 비트레이트 제약) (VBR)"
+RateControlMethod.VBRLAT="가변 비트레이트(지연율 제약) (VBR_LAT)"
+PrePassMode="프리-패스 모드"
+PrePassMode.Description="프리-패스 방식은 부가적인 처리를 하여 한 장면에서 비트레이트를 더 효율적으로 배분합니다. 카드마다 결과가 다를 수 있습니다."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (1/4 크기)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (1/2 크기)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (실물 크기)"
+Bitrate.Target="목표 비트레이트"
+Bitrate.Target.Description="전체 장면에서 달성하려는 비트레이트"
+Bitrate.Peak="최대 비트레이트"
+Bitrate.Peak.Description="전체 장면에서 달성하려는 비트레이트 최고조"
+QP.IFrame="I-프레임 QP"
+QP.IFrame.Description="I-화면에 사용할 고정 QP 값입니다."
+QP.PFrame="P-프레임 QP"
+QP.PFrame.Description="P-화면에 사용할 고정 QP 값입니다."
+QP.BFrame="B-프레임 QP"
+QP.BFrame.Description="B-화면에 사용할 고정 QP 값입니다."
+QP.Minimum="최소 QP"
+QP.Minimum.Description="프레임 한 장에 사용할 최저 QP 값입니다."
+QP.IFrame.Minimum="최소 I-프레임 QP"
+QP.IFrame.Minimum.Description="I-프레임 한 장에 사용할 최저 QP 값입니다."
+QP.PFrame.Minimum="최소 P-프레임 QP"
+QP.PFrame.Minimum.Description="P-프레임 한 장에 사용할 최저 QP 값입니다."
+QP.Maximum="최대 QP"
+QP.Maximum.Description="프레임 한 장에 사용할 최고 QP 값입니다."
+QP.IFrame.Maximum="최대 I-프레임 QP"
+QP.IFrame.Maximum.Description="I-프레임 한 장에 사용할 최고 QP 값입니다."
+QP.PFrame.Maximum="최대 P-프레임 QP"
+QP.PFrame.Maximum.Description="P-프레임 한 장에 사용할 최고 QP 값입니다."
+FillerData="채우기 정보"
+FillerData.Description="데이터 채우기는 인코더가 한 장면에 남은 공간을 빈 정보로 채워 목표 비트레이트를 유지할 수 있도록 합니다."
+FrameSkipping="프레임 생략"
+FrameSkipping.Description="프레임 생략은 인코더가 목표로 하는 비트레이트 요건을 맞추기 위해 프레임을 떨어뜨릴 수 있습니다.\n인코더가 프레임 하나를 떨어뜨리면 마지막 프레임 NAL을 대신 전송합니다.\n목표 비트레이트가 아주 낮을 때 도움이 될 수 있습니다."
+VBAQ="VBAQ"
+VBAQ.Description="'분산 기반 적응 양자화' (VBAQ) 를 사용하여 비트레이트를 효율적으로 배분합니다.\n이 방식은 인간의 시각 체계가 고밀도의 질감을 표현하는 영역에서 보이는 인공결함에 대해 덜 예민한 점을 이용했습니다. 따라서 동일한 비트레이트로 더 매끄러운 표면을 연출할 수 있습니다.\n처리하는 영상의 내용에 따라 품질에 대한 주관적인 평가가 개선될 수 있습니다."
+EnforceHRD="HRD 강제 적용"
+EnforceHRD.Description="가상 참조 디코더를 강제로 적용하여 출력 비트스트림을 검증합니다."
+VBVBuffer="VBV 버퍼"
+VBVBuffer.Description="VBV 버퍼 크기를 결정하는 방식을 설정합니다:\n-'자동'은 엄격도의 제약하에 크기를 계산합니다.\n-'수동'은 사용자가 크기를 조절할 수 있도록 허용합니다.\n일부 특정 속도제어 방식이 사용하는 VBV (Video Buffering Verifier) 버퍼는 제공된 제약 안에서 전반적인 비트레이트를 유지합니다."
+VBVBuffer.Strictness="VBV 버퍼 엄격도"
+VBVBuffer.Strictness.Description="VBV 버퍼의 엄격도를 설정합니다. 0%는 제약이 사라지고 100%는 최대한 제한을 합니다."
+VBVBuffer.Size="VBV 버퍼 크기"
+VBVBuffer.Size.Description="VBV의 크기는 한 장면의 비트레이트 제어에 사용하는 단위입니다."
+VBVBuffer.InitialFullness="VBV 버퍼 초기 충만도"
+VBVBuffer.InitialFullness.Description="초기 VBV버퍼가 얼마나 충만한지는 오로지 인코딩의 초반에만 영향을 미칩니다."
+KeyframeInterval="키프레임 간격"
+KeyframeInterval.Description="키프레임 사이의 간격 (초)."
+H264.IDRPeriod="IDR 기간 (프레임)"
+H264.IDRPeriod.Description="프레임 내에서 순간 복호 갱신(nstantaneous Decoding Refreshes) 사이의 거리를 설정합니다. 또한, GOP-장면 크기를 제어합니다."
+H265.IDRPeriod="IDR 기간 (프레임)"
+H265.IDRPeriod.Description="GOP 내에서 Instantaneous Decoding Refreshes (IDR) 의 간격을 설정합니다."
+GOP.Type="GOP 형식"
+GOP.Type.Description="GOP 형식을 결정합니다:\n- '\@GOP.Type.Fixed\@'는 GOP 간격을 항상 고정합니다.\n- '\@GOP.Type.Variable\@' 는 GOP 의 크기를 필요에 따라 조정합니다.\n'\@GOP.Type.Fixed\@'는 H264적용 방식이며 로컬 네트워크 스트리밍에 가장 알맞습니다. '\@GOP.Type.Variable\@'는 작은 크기, 고품질 녹화에 가장 알맞습니다."
+GOP.Type.Fixed="고정"
+GOP.Type.Variable="가변"
+GOP.Size="GOP 크기"
+GOP.Size.Description="프레임 내 GOP 크기"
+GOP.Size.Minimum="GOP 크기 최소"
+GOP.Size.Minimum.Description="프레임 내 GOP 크기를 최소화함"
+GOP.Size.Maximum="GOP 크기 최대"
+GOP.Size.Maximum.Description="프레임 내 GOP(Group of Pictures) 크기를 최대화함"
+GOP.Alignment="GOP 조정"
+GOP.Alignment.Description="현재 실험 및 개발 중인 기능입니다."
+BFrame.Pattern="B-화면 양상"
+BFrame.Pattern.Description="인코딩에 얼마나 많은 B-화면을 사용할지 설정합니다.\n2, 3세대 VCE카드에서 지원합니다. 인코딩 성능에 부정적인 영향을 줍니다."
+BFrame.DeltaQP="B-화면 델타 QP"
+BFrame.DeltaQP.Description="비참조 B-화면에 쓰이는 마지막 I- 혹은P-화면의 델타 QP 값"
+BFrame.Reference="B-프레임 참조"
+BFrame.Reference.Description="P-와 I-화면뿐만 아니라 B-화면도 참조할 수 있도록 허용합니다."
+BFrame.ReferenceDeltaQP="B-프레임 참조 델타 QP"
+BFrame.ReferenceDeltaQP.Description="참조 B-화면에 쓰이는 마지막 I- 혹은P-화면의 델타 QP 값."
+DeblockingFilter="디블록 필터"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/nb-NO.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/nb-NO.ini Changed

@@ -1,20 +1,21 @@
-AMF.Util.Default="Standard"
-AMF.Util.Automatic="Automatisk"
-AMF.Util.Toggle.Disabled="Deaktivert"
-AMF.Util.Toggle.Enabled="Aktivert"
-AMF.H264.Usage.Transcoding="Transkoding"
-AMF.H264.Usage.UltraLowLatency="Ultra-lav latens"
-AMF.H264.Usage.LowLatency="Lav latens"
-AMF.H264.QualityPreset="Kvalitet forhåndsinnstilling"
-AMF.H264.QualityPreset.Speed="Hastighet"
-AMF.H264.QualityPreset.Balanced="Balansert"
-AMF.H264.QualityPreset.Quality="Kvalitet"
-AMF.H264.Profile="Profil"
-AMF.H264.ProfileLevel="Profilnivå"
-AMF.H264.Bitrate.Target="Mål Bitrate"
-AMF.H264.Bitrate.Peak="Maks bitrate"
-AMF.H264.QP.Minimum="Minste QP"
-AMF.H264.QP.Maximum="Maksimal QP"
-AMF.H264.EnforceHRDCompatibility="Håndheve HRD kompatibilitet"
-AMF.H264.ScanType="Skanne Type"
+Utility.Default="Standard"
+Utility.Automatic="Automatisk"
+Utility.Manual="Manuell"
+Utility.Switch.Disabled="Deaktivert"
+Utility.Switch.Enabled="Aktivert"
+Preset="Preset"
+Preset.ResetToDefaults="Tilbakestill innstillinger"
+Preset.Recording="Opptak"
+Preset.HighQuality="Høy kvalitet"
+Preset.Lossless="Tapsfri"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage.Transcoding="Transkoding"
+Usage.Webcam="Webkamera"
+QualityPreset.Speed="Hastighet"
+QualityPreset.Balanced="Balansert"
+QualityPreset.Quality="Kvalitet"
+Profile="Profil"
+Profile.Description="Hvilke profil å kode med. Sortert fra best støttede (øverst) til beste kvalitet (nederst)."
+ProfileLevel="Profilnivå"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/nl-NL.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/nl-NL.ini Changed

@@ -1,90 +1,67 @@
-AMF.Util.Default="Standaard"
-AMF.Util.Automatic="Automatisch"
-AMF.Util.Manual="Handmatig"
-AMF.Util.Toggle.Disabled="Uitgeschakeld"
-AMF.Util.Toggle.Enabled="Ingeschakeld"
-AMF.H264.Preset="Voorkeursinstelling"
-AMF.H264.Preset.ResetToDefaults="Standaardinstellingen herstellen"
-AMF.H264.Preset.Recording="Opname"
-AMF.H264.Preset.HighQuality="Hoge kwaliteit"
-AMF.H264.Preset.Indistinguishable="Ononderscheidbaar"
-AMF.H264.Preset.Lossless="Lossless"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Gebruik"
-AMF.H264.Usage.Description="Voor welk gebruik moet AMF ingesteld worden:\n- 'Transcoden' is standaard transcoden (aanbevolen),\n- 'Ultra Low Latency' is voor erg lage latency encoding,\n- 'Low Latency' is vergelijkbaar met bovenstaande met een iets hogere latency.\nVoor streamen is alleen 'Transcoden' mogelijk, alle andere waarden kunnen worden gebruikt voor opnemen."
-AMF.H264.Usage.Transcoding="Transcoding"
-AMF.H264.Usage.UltraLowLatency="Ultra Low Latency"
-AMF.H264.Usage.LowLatency="Low Latency"
-AMF.H264.QualityPreset="Kwaliteitsinstelling"
-AMF.H264.QualityPreset.Description="Welke kwaliteitsinstelling AMF moet proberen te halen:\n- '\@AMF.H264.QualityPreset.Speed\@' is de snelste maar heeft de slechtste kwaliteit,\n- '\@AMF.H264.QualityPreset.Balanced\@' is een gebalanceerde mix van beide,\n- '\@AMF.H264.QualityPreset.Quality\@' geeft de beste kwaliteit voor een gekozen bitrate."
-AMF.H264.QualityPreset.Speed="Snelheid"
-AMF.H264.QualityPreset.Balanced="Gebalanceerd"
-AMF.H264.QualityPreset.Quality="Kwaliteit"
-AMF.H264.Profile="Profiel"
-AMF.H264.Profile.Description="Welk h.264 profiel gebruikt moet worden, gesorteerd van beste kwaliteit tot breedste ondersteuning."
-AMF.H264.ProfileLevel="Profielniveau"
-AMF.H264.ProfileLevel.Description="Welk H.264 profielniveau moet worden gebruikt voor encoden:\n- 'Automatisch' berekent het beste profielniveau voor de gebruikte framerate en framegrootte.\n- '4.1' ondersteunt 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' ondersteunt 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' ondersteunt1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' ondersteunt3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' ondersteunt 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Rate control methode"
-AMF.H264.RateControlMethod.Description="Welke rate control methode gebruikt moet worden:\n- '\@AMF.H264.RateControlMethod.CQP\@' kent vaste I-/P-/B-Frame QP waardes toe,\n- '\@AMF.H264.RateControlMethod.CBR\@' blijft op de insgestelde doelbitrate (met opvuldata) (aanbevolen voor streamen),\n- '\@AMF.H264.RateControlMethod.VBR\@' blijft onder de ingestelde piek bitrate,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' blijft in de buurt van de doelbitrate als de GPU latency en belasting het toestaan, anders zal er een hogere bitrate worden gebruikt (aanbevolen voor opnames)."
-AMF.H264.RateControlMethod.CQP="Constant QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Constant Bitrate (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Variable Bitrate (Peak Constrained) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Variable Bitrate (Latency Constrained) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Doelbitrate"
-AMF.H264.Bitrate.Target.Description="Bitrate om te proberen aan te houden in de gehele reeks."
-AMF.H264.Bitrate.Peak="Maximale bitrate"
-AMF.H264.Bitrate.Peak.Description="Bitrate om in de gehele reeks maximaal naartoe te pieken."
-AMF.H264.QP.Minimum="Minimale QP"
-AMF.H264.QP.Minimum.Description="Laagste QP waarde om te gebruiken in een frame."
-AMF.H264.QP.Maximum="Maximale QP"
-AMF.H264.QP.Maximum.Description="Hoogste QP waarde om te gebruiken in een frame."
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.IFrame.Description="Vaste QP waarde om te gebruiken voor I-frames."
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.PFrame.Description="Vaste QP waarde om te gebruiken voor P-frames."
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.QP.BFrame.Description="Vaste QP waarde om te gebruiken voor B-frames."
-AMF.H264.VBVBuffer="VBV Buffer"
-AMF.H264.VBVBuffer.Description="Welke methode moet worden gebruikt om de VBV buffergrootte te bepalen:\n- '\@AMF.Util.Automatic\@' berekent de grootte met een strengheid-instelling.\n- '\@AMF.Util.Manual\@' laat de gebruiker de grootte bepalen.\nVBV (Video Buffering Verifier) buffer wordt gebruikt door bepaalde Rate Control methodes om de algehele bitrate binnen de aangegeven perken te houden."
-AMF.H264.VBVBuffer.Strictness="VBV Buffer-strengheid"
-AMF.H264.VBVBuffer.Strictness.Description="Bepaalt de strengheid van de VBV buffer, waar 100% zo streng mogelijk is, en 0% geen restricties oplegt."
-AMF.H264.VBVBuffer.Size="VBV Buffergrootte"
-AMF.H264.VBVBuffer.Size.Description="De grootte van de VBV Buffer welke wordt gebruikt voor bitrate controle in een reeks."
-AMF.H264.VBVBuffer.Fullness="VBV Buffervulling"
-AMF.H264.VBVBuffer.Fullness.Description="Hoe vol de VBV Buffer initieel is, beïnvloedt alleen de initiële reeks van encoden."
-AMF.H264.FillerData="Opvuldata"
-AMF.H264.FillerData.Description="Inschakelen van opvuldata laat de encoder tenminste de doelbitrate aanhouden door de overtollige ruimte in een reeks te vullen met lege informatie."
-AMF.H264.FrameSkipping="Frames overslaan"
-AMF.H264.FrameSkipping.Description="Frame Skipping laat een encoder frames droppen om de doelbitrate te halen.\nAls de encoder een frame dropt vult het een herhaal-laatste-frame NAL in de stream.\nKan helpen bij erg lage doelbitrates."
-AMF.H264.EnforceHRDCompatibility="Forceer HDR compatibiliteit"
-AMF.H264.EnforceHRDCompatibility.Description="Forceer hypothetische referentiedecoder-restricties welke de maximale QP waarde veranderen binnen een frame."
-AMF.H264.KeyframeInterval="Keyframe-Interval"
-AMF.H264.KeyframeInterval.Description="Bepaalt de afstand tussen keyframes in seconden. Bepaalt ook de GOP-sequence size."
-AMF.H264.IDRPeriod="IDR Periode"
-AMF.H264.IDRPeriod.Description="Bepaalt de afstand tussen Instantaneous Decoding Refreshes (IDR) in frames. Bepaalt ook de GOP-sequence size."
-AMF.H264.BFrame.Pattern="B-frames"
-AMF.H264.BFrame.Pattern.Description="Het aantal B-frames om te gebruiken tijdens het encoden.\nOndersteund door 2e en 3e generatie VCE-kaarten. Negatieve invloed op encodingprestaties."
-AMF.H264.BFrame.DeltaQP="Delta QP voor B-frames"
-AMF.H264.BFrame.DeltaQP.Description="Delta QP waarde tot de laatste I- of P-frame voor niet-refereerbare B-frames."
-AMF.H264.BFrame.Reference="Refereerbare B-frames"
-AMF.H264.BFrame.Reference.Description="Laat een B-frame ook B-frames gebruiken als referentie, in plaats van enkel P- en I-frames."
-AMF.H264.BFrame.ReferenceDeltaQP="Delta QP voor refereerbare B-frames"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Delta QP waarde tot de laatste I- of P-frame voor refereerbare B-frames."
-AMF.H264.DeblockingFilter="Deblocking Filter"
-AMF.H264.DeblockingFilter.Description="Staat de encoder toe om een Deblocking Filter te gebruiken voor de gecodeerde stream."
-AMF.H264.ScanType="Scantype"
-AMF.H264.ScanType.Description="Welke scanmethode gebruikt moet worden, laat dit altijd op '\@AMF.H264.ScanType.Progressive\@'."
-AMF.H264.ScanType.Progressive="Progressive"
-AMF.H264.ScanType.Interlaced="Interlaced"
-AMF.H264.MotionEstimation="Bewegingsschatting"
-AMF.H264.MotionEstimation.Description="Bewigingsschatting laat de encoder de benodigde bitrate verlagen door te schatten waar een pixel heen ging."
-AMF.H264.MotionEstimation.None="Geen"
-AMF.H264.MotionEstimation.Half="Halve pixel"
-AMF.H264.MotionEstimation.Quarter="Kwartpixel"
-AMF.H264.MotionEstimation.Both="Halve en kwartpixel"
-AMF.H264.CodingType="Codeertype"
-AMF.H264.CodingType.Description="Welk codeertype gebruikt moet worden:\n* \@AMF.Util.Default\@ laat AMF bepalen (aanbevolen).\n* CALVC (Context-Adaptive Variable-Length Coding) is sneller, maar groter.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) is langzamer, maar kleiner."
+Utility.Default="Standaard"
+Utility.Automatic="Automatisch"
+Utility.Manual="Handmatig"
+Utility.Switch.Disabled="Uitgeschakeld"
+Utility.Switch.Enabled="Ingeschakeld"
+Preset="Voorkeursinstelling"
+Preset.ResetToDefaults="Standaardinstellingen herstellen"
+Preset.Recording="Opname"
+Preset.HighQuality="Hoge kwaliteit"
+Preset.Indistinguishable="Ononderscheidbaar"
+Preset.Lossless="Lossless"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Gebruik"
+Usage.Description="Voor welk gebruik moet AMF ingesteld worden:\n- '\@Usage.Transcoding\@' is standaard transcoden (aanbevolen),\n- '\@Usage.UltraLowLatency\@' is voor erg lage latency encoding,\n- '\@Usage.LowLatency\@' is vergelijkbaar met bovenstaande met een iets hogere latency.\nVoor streamen is alleen '\@Usage.Transcoding\@' mogelijk, alle andere waarden kunnen worden gebruikt voor opnemen."
+Usage.Transcoding="Transcoding"
+Usage.UltraLowLatency="Ultra Low Latency"
+Usage.LowLatency="Low Latency"
+Usage.Webcam="Webcam"
+QualityPreset="Kwaliteitsinstelling"
+QualityPreset.Description="Welke kwaliteitsinstelling AMF moet proberen te halen:\n- '\@QualityPreset.Speed\@' is de snelste maar heeft de slechtste kwaliteit,\n- '\@QualityPreset.Balanced\@' is een gebalanceerde mix van beide,\n- '\@QualityPreset.Quality\@' geeft de beste kwaliteit voor een gekozen bitrate."
+QualityPreset.Speed="Snelheid"
+QualityPreset.Balanced="Gebalanceerd"
+QualityPreset.Quality="Kwaliteit"
+Profile="Profiel"
+Profile.Description="Met welk profiel geëncodet moet worden. Gesorteerd van best ondersteunt (boven) tot beste kwaliteit (onder)."
+ProfileLevel="Profielniveau"
+Tier="Niveau"
+AspectRatio="Beeldverhouding"
+CodingType="Codeertype"
+MaximumReferenceFrames="Maximale referentieframes"
+RateControlMethod="Rate control methode"
+RateControlMethod.CQP="Constant QP (CQP)"
+RateControlMethod.CBR="Constant Bitrate (CBR)"
+RateControlMethod.VBR="Variable Bitrate (Peak Constrained) (VBR)"
+RateControlMethod.VBRLAT="Variable Bitrate (Latency Constrained) (VBRLAT)"
+Bitrate.Target="Doelbitrate"
+VBVBuffer.InitialFullness="Initiële VBV Buffervulling"
+KeyframeInterval="Keyframe-Interval"
+GOP.Type.Fixed="Vast"
+GOP.Type.Variable="Variabel"
+GOP.Size="GOP-grootte"
+GOP.Alignment="GOP-uitlijning"
+BFrame.Pattern.Description="Het aantal B-frames om te gebruiken tijdens het encoden.\nOndersteund door 2e en 3e generatie VCE-kaarten. Negatieve invloed op encodingprestaties."
+BFrame.DeltaQP.Description="Delta QP waarde tot de laatste I- of P-frame voor niet-refereerbare B-frames."
+BFrame.Reference.Description="Laat een B-frame ook B-frames gebruiken als referentie, in plaats van enkel P- en I-frames."
+BFrame.ReferenceDeltaQP.Description="Delta QP waarde tot de laatste I- of P-frame voor refereerbare B-frames."
+DeblockingFilter="Deblocking Filter"
+MotionEstimation="Bewegingsschatting"
+MotionEstimation.Description="Bewigingsschatting laat de encoder de benodigde bitrate verlagen door te schatten waar een pixel heen ging."
+MotionEstimation.Quarter="Kwartpixel"
+MotionEstimation.Half="Halve pixel"
+MotionEstimation.Full="Kwart- & Halve Pixel"
+Video.API="Video API"
+Video.API.Description="Welke API moet de backend gebruiken?"
+Video.Adapter="Videoadapter"
+Video.Adapter.Description="Op welke adapter moeten we proberen te encoden?"
+OpenCL="OpenCL"
+View="Weergavemodus"
+View.Basic="Simpel"
+View.Advanced="Geavanceerd"
+View.Expert="Expert"
+View.Master="Meester"
+Debug="Debug"
 AMF.H264.MaximumLTRFrames="Maximale LTR Frames"
 AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) frames zijn een functie waarmee de encoder bepaalde frames in een reeks kan aanmerken als refereerbaar gedurende een lange tijd.\nLTR frames kunnen niet met B-frames gebruikt worden, en de encoder zal B-frames ook uitzetten als deze gebruikt worden."
 AMF.H264.MaximumAccessUnitSize="Maximale Access Unit grootte"
@@ -93,16 +70,6 @@
 AMF.H264.HeaderInsertionSpacing.Description="Hoeveel frames er tussen NAL headers moeten zitten."
 AMF.H264.WaitForTask="Wacht op taak"
 AMF.H264.WaitForTask.Description="Onbekend, experimenteel"
-AMF.H264.PreAnalysisPass="Pre-analyse pass"
-AMF.H264.PreAnalysisPass.Description="Onbekend, experimenteel"
-AMF.H264.VBAQ="VBAQ"
-AMF.H264.VBAQ.Description="Onbekend, experimenteel"
-AMF.H264.GOPSize="GOP-grootte"
-AMF.H264.GOPSize.Description="Onbekend, experimenteel"
-AMF.H264.GOPAlignment="GOP-uitlijning"
-AMF.H264.GOPAlignment.Description="Onbekend, experimenteel"
-AMF.H264.MaximumReferenceFrames="Maximale referentieframes"
-AMF.H264.MaximumReferenceFrames.Description="Onbekend, experimenteel"
 AMF.H264.SlicesPerFrame="Segmenten per frame"
 AMF.H264.SlicesPerFrame.Description="Hoeveel I-frame segmenten moeten er worden opgeslagen bij elke frame?\nEen waarde van nul laat de encoder bepalen.\nIntra-refresh encoding wordt gebruikt voor snellere weergave van en zoeken door video."
 AMF.H264.SliceMode="Slice-modus"
@@ -117,18 +84,4 @@
 AMF.H264.IntraRefresh.NumberOfStripes.Description="Onbekend, experimenteel"
 AMF.H264.IntraRefresh.MacroblocksPerSlot="Intra-Refresh Macroblocks per Slot"
 AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Hoeveel Macroblocks moeten er in elk slot worden opgeslagen?\nEen waarde van 0 schakelt deze functie uit.\nIntra-Refresh encoding wordt gebruikt voor snellere weergave van en zoeken door video."
-AMF.H264.VideoAPI="Video API"
-AMF.H264.VideoAPI.Description="Welke API gebruikt moet worden voor encoden."
-AMF.H264.VideoAdapter="Videoadapter"
-AMF.H264.VideoAdapter.Description="Welke apter gebruikt moet worden voor encoding."
-AMF.H264.OpenCL="OpenCL"
-AMF.H264.OpenCL.Description="Moet de encoder OpenCL gebruiken om de individuele frames te leveren?"
-AMF.H264.View="Weergavemodus"
-AMF.H264.View.Description="Welke eigenschappen moeten getoond worden?\nHet gebruiken van '\@AMF.H264.View.Master\@' diskwalificeert je voor het ontvangen van ondersteuning."
-AMF.H264.View.Basic="Simpel"
-AMF.H264.View.Advanced="Geavanceerd"
-AMF.H264.View.Expert="Expert"
-AMF.H264.View.Master="Meester"
-AMF.H264.Debug="Debug"
-AMF.H264.Debug.Description="Schakel extra debug-logging in, dit moet actief zijn als je ondersteuning nodig hebt met deze encoder."

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/pl-PL.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/pl-PL.ini Changed

@@ -1,86 +1,50 @@
-AMF.Util.Default="Domyślne"
-AMF.Util.Automatic="Automatycznie"
-AMF.Util.Manual="Ustawienia własne"
-AMF.Util.Toggle.Disabled="Wyłączone"
-AMF.Util.Toggle.Enabled="Włączone"
-AMF.H264.Preset="Profil"
-AMF.H264.Preset.ResetToDefaults="Przywróć ustawienia domyślne"
-AMF.H264.Preset.Recording="Nagrywanie"
-AMF.H264.Preset.HighQuality="Wysoka jakość"
-AMF.H264.Preset.Indistinguishable="Nie do odróżnienia"
-AMF.H264.Preset.Lossless="Bezstratny"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Sposób użycia"
-AMF.H264.Usage.Transcoding="Konwersja"
-AMF.H264.Usage.UltraLowLatency="Bardzo niskie opóźnienie"
-AMF.H264.Usage.LowLatency="Niskie opóźnienie"
-AMF.H264.QualityPreset="Ustawienie jakości"
-AMF.H264.QualityPreset.Speed="Szybkość"
-AMF.H264.QualityPreset.Balanced="Zrównoważone"
-AMF.H264.QualityPreset.Quality="Jakość"
-AMF.H264.Profile="Profil"
-AMF.H264.ProfileLevel="Profil"
-AMF.H264.RateControlMethod="Metoda kontroli przepływności"
-AMF.H264.RateControlMethod.CQP="Stała QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Stała przepływność (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Zmienna przepływność (z ograniczeniem górnym) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Zmienna przepływność (z ograniczeniem opóźnieniem) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Przepływność docelowa"
-AMF.H264.Bitrate.Target.Description="Średni bitrate do uzyskania w sekwencji."
-AMF.H264.Bitrate.Peak="Przepływność szczytowa"
-AMF.H264.Bitrate.Peak.Description="Maksymalny bitrate do uzyskania w sekwencji."
-AMF.H264.QP.Minimum="Minimalna QP"
-AMF.H264.QP.Minimum.Description="Najniższa wartość QP (parametr kwantyzacji) do użycia w ramce."
-AMF.H264.QP.Maximum="Maksymalna QP"
-AMF.H264.QP.Maximum.Description="Najwyższa wartość QP (parametr kwantyzacji) do użycia w ramce."
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.IFrame.Description="Stała wartość QP dla ramek I-Frame."
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.PFrame.Description="Stała wartość QP dla ramek P-Frame."
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.QP.BFrame.Description="Stała wartość QP (parametr kwantyzacji) do użycia w ramce B-Frame."
-AMF.H264.VBVBuffer="Bufor VBV"
-AMF.H264.VBVBuffer.Strictness="Odchylenie bufora VBV"
-AMF.H264.VBVBuffer.Strictness.Description="Określa rygor wykorzystania bufora VBV, gdzie 100% oznacza pełne podporządkowanie wartości a 0% - dowolne."
-AMF.H264.VBVBuffer.Size="Rozmiar bufora VBV"
-AMF.H264.VBVBuffer.Size.Description="Rozmiar bufora VBV używanego w kontroli przepływności sekwencji kodowania."
-AMF.H264.VBVBuffer.Fullness="Zapełnienie bufora VBV"
-AMF.H264.VBVBuffer.Fullness.Description="Jak bardzo zapełniony na starcie powinien być bufor VBV. Wpływa jedynie na początkową sekwencję kodowania."
-AMF.H264.FillerData="Filler Data"
-AMF.H264.FrameSkipping="Pomijanie klatek"
-AMF.H264.EnforceHRDCompatibility="Wymuszanie zgodności HRD"
-AMF.H264.KeyframeInterval="Interwał klatki kluczowej"
-AMF.H264.KeyframeInterval.Description="Określa odległość (w sekundach) między klatkami kluczowymi oraz kontroluje rozmiar GOP."
-AMF.H264.IDRPeriod="Okres IDR"
-AMF.H264.IDRPeriod.Description="Określa (w klatkach) odległość między natychmiastowymi odświeżeniami dekodera. Kontroluje również rozmiar sekwencji GOP.
-"
-AMF.H264.DeblockingFilter="Filtr niwelujacy bloki obrazu"
-AMF.H264.ScanType="Metoda skanowania"
-AMF.H264.ScanType.Progressive="Progresywne"
-AMF.H264.ScanType.Interlaced="Z przeplotem"
-AMF.H264.MotionEstimation="Szacowania ruchu"
-AMF.H264.MotionEstimation.None="Żaden"
-AMF.H264.MotionEstimation.Half="Pół piksela"
-AMF.H264.MotionEstimation.Quarter="Kwartał piksela"
-AMF.H264.MotionEstimation.Both="Pół i kwartał piksela"
-AMF.H264.CodingType="Typ kodowania"
+Utility.Default="Domyślnie"
+Utility.Automatic="Automatycznie"
+Utility.Manual="Ustawienia własne"
+Utility.Switch.Disabled="Wyłączone"
+Utility.Switch.Enabled="Włączone"
+Preset="Profil"
+Preset.ResetToDefaults="Przywróć ustawienia domyślne"
+Preset.Recording="Nagrywanie"
+Preset.HighQuality="High Quality (wysoka jakość)"
+Preset.Indistinguishable="Nie do odróżnienia"
+Preset.Lossless="Lossless (bezstratny)"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Sposób użycia"
+Usage.Transcoding="Konwersja"
+Usage.UltraLowLatency="Bardzo niskie opóźnienie"
+Usage.LowLatency="Niskie opóźnienie"
+Usage.Webcam="Kamerka internetowa"
+QualityPreset="Ustawienie jakości"
+QualityPreset.Speed="Szybkość"
+QualityPreset.Balanced="Zrównoważone"
+QualityPreset.Quality="Jakość"
+Profile="Profil"
+ProfileLevel="Profil - poziom"
+Tier="Poziom"
+AspectRatio="Współczynnik proporcji"
+CodingType="Typ kodowania"
+AMF.H264.MaximumLTRFrames="Maksimum ramek LTR"
+AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) Frames (ramki LTR) to opcja pozwalająca na oznaczenie przez enkoder ramek, które mają być referencyjnymi przez dłuższy czas.\nRamki LTR nie mogą być używane wraz z B-ramkami. Enkoder wyłączy B-ramki w przypadku użycia opcji ramek LTR."
 AMF.H264.MaximumAccessUnitSize="Maksymalny rozmiar Access Unit"
 AMF.H264.MaximumAccessUnitSize.Description="Maksymalny rozmiar Access Unit. Wartość 0 umożliwia enkoderowi wybranie najlepszej wartości."
 AMF.H264.HeaderInsertionSpacing="Rozmiar nagłówka (w klatkach)"
 AMF.H264.HeaderInsertionSpacing.Description="Ile klatek powinno być między nagłówkami. Nie zaleca się zmieniać wartości na inną niż 0 (automatycznie)."
-AMF.H264.VideoAPI="Typ API"
-AMF.H264.VideoAPI.Description="Rodzaj API wykorzystywanego do enkodowania."
-AMF.H264.VideoAdapter="Karta graficzna"
-AMF.H264.VideoAdapter.Description="Karta graficzna wykorzystywana do enkodowania."
-AMF.H264.OpenCL="OpenCL"
-AMF.H264.OpenCL.Description="Czy enkoder ma użyć OpenCL do wysyłania poszczególnych klatek?"
-AMF.H264.View="Tryb ustawień"
-AMF.H264.View.Description="Którego typu ustawień używać.\nWłączenie '\@AMF.H264.View.Master\@' oznacza rezygnację ze wsparcia technicznego."
-AMF.H264.View.Basic="Podstawowy"
-AMF.H264.View.Advanced="Zaawansowany"
-AMF.H264.View.Expert="Ekspercki"
-AMF.H264.View.Master="Pełny"
-AMF.H264.Debug="Debugowanie"
-AMF.H264.Debug.Description="Włącza dodatkowe opcje logowania w trybie debug. Przydatne w przypadku poszukiwania wsparcia technicznego dla tego enkodera."
+AMF.H264.WaitForTask="Wait For Task"
+AMF.H264.WaitForTask.Description="Nieznany, eksperymentalne"
+AMF.H264.SlicesPerFrame="Liczba bloków w jednej klatce"
+AMF.H264.SlicesPerFrame.Description="Ile bloków I-ramek powinno być zapisanych w jednej ramce?\nWartość 0 oznacza, że enkoder decyduje automatycznie.\nEnkodowanie Intra-Refresh używane jest w celu szybszego odtwarzania i przewijania."
+AMF.H264.SliceMode="Slice Mode"
+AMF.H264.SliceMode.Description="Nieznany, eksperymentalne"
+AMF.H264.MaximumSliceSize="Maksymalny rozmiar bloku"
+AMF.H264.MaximumSliceSize.Description="Nieznany, eksperymentalne"
+AMF.H264.SliceControlMode="Tryb kontroli bloku"
+AMF.H264.SliceControlMode.Description="Nieznany, eksperymentalne"
+AMF.H264.SliceControlSize="Rozmiar kontroli bloku"
+AMF.H264.SliceControlSize.Description="Nieznany, eksperymentalne"
+AMF.H264.IntraRefresh.NumberOfStripes="Liczba pasków Intra-Refresh"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Nieznany, eksperymentalne"
+AMF.H264.IntraRefresh.MacroblocksPerSlot="Liczba makrobloków Intra-Refresh na slot"
+AMF.H264.IntraRefresh.MacroblocksPerSlot.Description="Ile makrobloków należy zapisać w jednym slocie?\n0 wyłącza opcję\nEnkodowanie Intra-Refresh pozwala na szybsze odtwarzanie i przewijanie."

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/pt-BR.ini Added

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/ru-RU.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/ru-RU.ini Changed

@@ -1,90 +1,135 @@
-AMF.Util.Default="По умолчанию"
-AMF.Util.Automatic="Автоматически"
-AMF.Util.Manual="Руководство"
-AMF.Util.Toggle.Disabled="Выключено"
-AMF.Util.Toggle.Enabled="Включено"
-AMF.H264.Preset="Предустановка"
-AMF.H264.Preset.ResetToDefaults="Сброс по умолчанию"
-AMF.H264.Preset.Recording="Запись"
-AMF.H264.Preset.HighQuality="Высокое качество"
-AMF.H264.Preset.Indistinguishable="Незаметные потери"
-AMF.H264.Preset.Lossless="Без потерь"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Назначение"
-AMF.H264.Usage.Description="На какой режим использования должен быть настроен AMF:\n- 'Перекодировка' — для перекодировки общего назначения (рекомендуется),\n- 'Очень низкая задержка' — для кодировки с очень низкой задержкой,\n- 'Низкая задержка' похожа на пункт выше, но с немного большей задержкой.\nТрансляции поддерживают только 'перекодировку', все остальные значения могут быть использованы для записи."
-AMF.H264.Usage.Transcoding="Транскодирование"
-AMF.H264.Usage.UltraLowLatency="Очень низкая задержка"
-AMF.H264.Usage.LowLatency="Низкая задержка"
-AMF.H264.QualityPreset="Предустановки качества"
-AMF.H264.QualityPreset.Description="К какому пресету качества AMF нужно стремиться:\n-'Speed' самый быстрый, но имеет самое низкое качество,\n-'Balanced' между 'Speed' и 'Quality', предоставляет хорошее соотношение между скоростью и качеством,\n-'Quality' предоставляет наилучшее качество для предоставленного битрейта."
-AMF.H264.QualityPreset.Speed="Скорость"
-AMF.H264.QualityPreset.Balanced="Баланс"
-AMF.H264.QualityPreset.Quality="Качество"
-AMF.H264.Profile="Профиль кодирования"
-AMF.H264.Profile.Description="Какой профиль формата H.264, использовать для кодирования, отсортированный от высочайшего качества для самой широкой поддержки."
-AMF.H264.ProfileLevel="Уровень профиля"
-AMF.H264.ProfileLevel.Description="Какой уровень профиля H.264 использовать для кодирования:\n- 'Автоматически' выбирает наиболее подходящий уровень под выбранную частоту и размер кадра,\n- '4.1' поддерживает 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' поддерживает 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' поддерживает 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' поддерживает 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' поддерживает 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="Метод кодирования"
-AMF.H264.RateControlMethod.Description="Как оценить способ контроля должны быть использованы:\n- '\@AMF.H264.RateControlMethod.CQP\@' назначает фиксированные I-/P-/B-Значения кадра QP,\n- '\@AMF.H264.RateControlMethod.CBR\@' остается в данном целевом Битрейте (используя данные заполнителя) (рекомендуется для стрима),\n-'\@AMF.H264.RateControlMethod.VBR\@' остается ниже пика Битрейта,\n-'\@AMF.H264.RateControlMethod.VBR_LAT\@' остается близко к целевому Битрейту, если задержка GPU и нагрузки позволяют, в противном случае будут использовать более высокий Битрейт (рекомендуется для стрима)."
-AMF.H264.RateControlMethod.CQP="CQP: постоянное качество"
-AMF.H264.RateControlMethod.CBR="CBR: постоянный битрейт"
-AMF.H264.RateControlMethod.VBR.Peak="VBR: переменный битрейт (Ограничение пиков)"
-AMF.H264.RateControlMethod.VBR.Latency="VBR: переменный битрейт (Ограничение задержки)"
-AMF.H264.Bitrate.Target="Битрейт"
-AMF.H264.Bitrate.Target.Description="Битрейт желаемый для получения во всей последовательности."
-AMF.H264.Bitrate.Peak="Пиковый битрейт"
-AMF.H264.Bitrate.Peak.Description="Максимальный пиковый битрейт желаемый для получения во всей последовательности."
-AMF.H264.QP.Minimum="Минимальное QP"
-AMF.H264.QP.Minimum.Description="Наименьшее значение QP (Параметр квантования) для использования в кадре."
-AMF.H264.QP.Maximum="Максимальное QP"
-AMF.H264.QP.Maximum.Description="Наибольшее значение QP (Параметр квантования) для использования в кадре."
-AMF.H264.QP.IFrame="I-кадр QP"
-AMF.H264.QP.IFrame.Description="Фиксированное значение QP используемое для I-Кадров."
-AMF.H264.QP.PFrame="P-кадр QP"
-AMF.H264.QP.PFrame.Description="Фиксированное значение QP используемое для P-Кадров."
-AMF.H264.QP.BFrame="B-кадр QP"
-AMF.H264.QP.BFrame.Description="Фиксированное значение QP (Параметр квантования) для использования в B-Кадрах."
-AMF.H264.VBVBuffer="Буфер VBV"
-AMF.H264.VBVBuffer.Description="Какой метод следует использовать для определения Размера буфера VBV:\n- '\@AMF.Util.Automatic\@' рассчитывает размер ограничивающийся строгостью,\n- '\@AMF.Util.Manual\@' позволяет пользователю контролировать размер буфера.\nVBV (Верификатор буферизации видео) буфер используется некоторыми Методами управления скоростью, чтобы сохранить общий битрейт в пределах заданных ограничений."
-AMF.H264.VBVBuffer.Strictness="Строгость буфера VBV"
-AMF.H264.VBVBuffer.Strictness.Description="Определяет жесткость буфера vbv, при 100% будет максимально жестким и 0% будет неограниченным."
-AMF.H264.VBVBuffer.Size="Размер буфера VBV"
-AMF.H264.VBVBuffer.Size.Description="Размер буфера vbv, которая используется для управления скорости передачи данных в последовательности."
-AMF.H264.VBVBuffer.Fullness="Заполнение буфера VBV"
-AMF.H264.VBVBuffer.Fullness.Description="Изначальная степень заполнения VBV буфера, будет влиять только на первоначальную последовательность кодирования."
-AMF.H264.FillerData="Данные наполнителя"
-AMF.H264.FillerData.Description="Включение данных наполнителей позволяет кодировщику сохранять, по крайней мере, целевой Битрейт, заполняя оставшееся пространство в последовательности с пустой информации."
-AMF.H264.FrameSkipping="Пропуск кадров"
-AMF.H264.FrameSkipping.Description="Пропуск кадров позволяет кодировщику падение кадров в целях соответствия требованиям целевого битрейта.\nКогда в энкодере пропадает рамка вместо этого вставьте повторять-последний кадр NAL в стрим.\nМожет помочь с очень низким битрейтом."
-AMF.H264.EnforceHRDCompatibility="Принудительная HRD совместимость"
-AMF.H264.EnforceHRDCompatibility.Description="Соблюдение гипотетическому эталону Декодера ограничения, которые ограничивают максимальное значение QP изменения в кадре."
-AMF.H264.KeyframeInterval="Интервал ключевых кадров"
-AMF.H264.KeyframeInterval.Description="Сколько секунд должен быть просадок кадров.\nТакже контролирует GOP Size."
-AMF.H264.IDRPeriod="Период IDR"
-AMF.H264.IDRPeriod.Description="Определяет расстояние между Мгновенными обновлениями декодирования (IDR) в кадрах. Так же контролирует размер последовательности GOP."
-AMF.H264.BFrame.Pattern="B-Кадры"
-AMF.H264.BFrame.Pattern.Description="Количество B-кадров использованное при кодировании.\nПоддерживается 2-й и 3-й VCE карт поколения. Негативно влияет на производительность кодирования."
-AMF.H264.BFrame.DeltaQP="QP дельта для B-Кадров"
-AMF.H264.BFrame.DeltaQP.Description="Значение дельты QP в последних I- или P-Кадров для нессылаемых B-Кадров."
-AMF.H264.BFrame.Reference="Ссылаемые B-Кадры"
-AMF.H264.BFrame.Reference.Description="Разрешить B-Кадру так же использовать B-Кадры как ссылки, вместо просто P- и I-Кадров."
-AMF.H264.BFrame.ReferenceDeltaQP="Дельта QP для ссылаемых B-кадров"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Значение дельты QP в последних I- или P-Кадров для ссылаемых B-Кадров."
-AMF.H264.DeblockingFilter="Фильтр деблокинга"
-AMF.H264.DeblockingFilter.Description="Устанавливает флаг, что декодер может использовать фильтр удаления блочности для прямой трансляции."
-AMF.H264.ScanType="Развертка"
-AMF.H264.ScanType.Description="Какой режим сканирования использовать; всегда оставляется этот параметр на 'прогрессивном'."
-AMF.H264.ScanType.Progressive="Прогрессивная"
-AMF.H264.ScanType.Interlaced="Чересстрочная"
-AMF.H264.MotionEstimation="Оценка движения"
-AMF.H264.MotionEstimation.Description="Оценки движения позволяет кодировщику необходимость уменьшить Битрейт, оценивая, где пиксель прошел."
-AMF.H264.MotionEstimation.None="Нет"
-AMF.H264.MotionEstimation.Half="Пол-пиксельная"
-AMF.H264.MotionEstimation.Quarter="Четверть-пиксельная"
-AMF.H264.MotionEstimation.Both="Пол- & Четверть-пиксельная"
-AMF.H264.CodingType="Тип кодирования"
-AMF.H264.CodingType.Description="Какой тип кодирования использовать:\n* \@AMF.Util.Default\@ позволяет решать AMF (рекомендуется).\n* CALVC (контекстно-Адаптивное с переменной длинной кодирования) - это быстрее, но больше.\n* CABAC (контекстно-Адаптивное Двоичное арифметическое кодирование) - это медленнее, но меньше."
+Utility.Default="По умолчанию"
+Utility.Automatic="Автоматически"
+Utility.Manual="Вручную"
+Utility.Switch.Disabled="Выключено"
+Utility.Switch.Enabled="Включено"
+Preset="Предустановка"
+Preset.ResetToDefaults="Сбросить на значения по умолчанию"
+Preset.Recording="Запись"
+Preset.HighQuality="Высокое качество"
+Preset.Indistinguishable="Незаметные потери"
+Preset.Lossless="Без потерь"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Использование"
+Usage.Description="На какой режим использования должен быть настроен AMF:\n- '\@Usage.Transcoding\@' — для перекодировки общего назначения (рекомендуется),\n- '\@Usage.UltraLowLatency\@' — для кодировки с очень низкой задержкой,\n- '\@Usage.LowLatency\@' похожа на пункт выше, но с немного большей задержкой.\nТрансляции поддерживают только '\@Usage.Transcoding\@', все остальные значения могут быть использованы для записи."
+Usage.Transcoding="Транскодирование"
+Usage.UltraLowLatency="Очень низкая задержка"
+Usage.LowLatency="Низкая задержка"
+Usage.Webcam="Вебкамера"
+QualityPreset="Предустановки качества"
+QualityPreset.Description="К какой предустановке качества AMF нужно стремиться:\n- '\@QualityPreset.Speed\@' самая быстрая, но низкого качества,\n- '\@QualityPreset.Balanced\@ сбалансированное сочетание обоих,\n- '\@QualityPreset.Quality\@ предоставляет наилучшее качество для заданного битрейта."
+QualityPreset.Speed="Скорость"
+QualityPreset.Balanced="Баланс"
+QualityPreset.Quality="Качество"
+Profile="Профиль"
+Profile.Description="Какой профиль использовать для кодирования. Сортировка от лучшей поддержки (сверху) до лучшего качества (снизу)."
+ProfileLevel="Уровень профиля"
+ProfileLevel.Description="Уровень используемого профиля. Лучше оставить \@Utility.Automatic\@."
+Tier="Уровень"
+Tier.Description="На каком Уровне кодировать. \"Высокий\" нацелен на высокий битрейт/использование пропускной способности, в то время как \"Основной\" нацелен на средства массовой информации."
+AspectRatio="Соотношение сторон"
+AspectRatio.Description="С каким соотношением сторон должен быть записан выходной файл."
+CodingType="Тип кодирования"
+CodingType.Description="Какой тип кодирования использовать:\n* '\@Utility.Automatic\@' позволяет решать AMF (рекомендуется).\n* 'CALVC' (контекстно-Адаптивное с переменной длинной кодирования) - это быстрее, но больше.\n* 'CABAC' (контекстно-Адаптивное Двоичное арифметическое кодирование) - это медленнее, но меньше."
+MaximumReferenceFrames="Максимум кадров-ссылок"
+MaximumReferenceFrames.Description="Количество кадров, используемых кодировщиком в качестве опорных. Имеет непосредственное влияние на качество кодирования."
+RateControlMethod="Метод кодирования"
+RateControlMethod.Description="Какой способ контроля битрейта должен быть использован:\n- '\@RateControlMethod.CQP\@' задает фиксированные значения QP I-/P-/B-кадра,\n- '\@RateControlMethod.CBR\@' придерживается целевого битрейта (используя данные заполнителя) (рекомендуется для стрима),\n-'\@RateControlMethod.VBR\@' держится ниже пикового битрейта,\n-'\@RateControlMethod.VBRLAT\@' держится близко к целевому битрейту, если задержка GPU и нагрузка позволяют, в противном случае будет использован более высокий битрейт (рекомендуется для стрима)."
+RateControlMethod.CQP="Постоянное качество (CQP)"
+RateControlMethod.CBR="Постоянный битрейт (CBR)"
+RateControlMethod.VBR="Переменный битрейт (Ограничение пиков) (VBR)"
+RateControlMethod.VBRLAT="Переменный битрейт (Ограничение задержки) (VBR)"
+PrePassMode="Режим пред-прохода"
+PrePassMode.Description="Пред-проход - это вторичный проход распространения битрейта, который позволяет лучше распространить битрейт по последовательности, однако эффект от этого может варьироваться от карты к карте."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (Четверть размера)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (Половина размера)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (Полный размер)"
+Bitrate.Target="Битрейт"
+Bitrate.Target.Description="Битрейт, желаемый для получения во всей последовательности."
+Bitrate.Peak="Пиковый битрейт"
+Bitrate.Peak.Description="Максимальный пиковый битрейт, желаемый для получения во всей последовательности."
+QP.IFrame="I-кадр QP"
+QP.IFrame.Description="Фиксированное значение QP используемое для I-Кадров."
+QP.PFrame="P-кадр QP"
+QP.PFrame.Description="Фиксированное значение QP используемое для P-Кадров."
+QP.BFrame="B-кадр QP"
+QP.BFrame.Description="Фиксированное значение QP используемое для B-Кадров."
+QP.Minimum="Минимальное QP"
+QP.Minimum.Description="Наименьшее значение QP для использования в Кадре."
+QP.IFrame.Minimum="Минимальный QP I-Кадра"
+QP.IFrame.Minimum.Description="Наименьшее значение QP используемое для I-Кадров."
+QP.PFrame.Minimum="Минимальный QP P-Кадра"
+QP.PFrame.Minimum.Description="Наименьшее значение QP, используемое для P-Кадров."
+QP.Maximum="Максимальное QP"
+QP.Maximum.Description="Наибольшее значение QP для использования в Кадре."
+QP.IFrame.Maximum="Максимальный QP I-Кадра"
+QP.IFrame.Maximum.Description="Наибольшее значение QP для использования в I-Кадре."
+QP.PFrame.Maximum="Максимальный QP P-Кадра"
+QP.PFrame.Maximum.Description="Наибольшее значение QP для использования в P-Кадре."
+FillerData="Данные наполнителя"
+FillerData.Description="Включение данных наполнителей позволяет кодировщику сохранять, по крайней мере, целевой Битрейт, заполняя оставшееся пространство в последовательности с пустой информации."
+FrameSkipping="Пропуск кадров"
+FrameSkipping.Description="Пропуск кадров позволяет кодировщику падение кадров в целях соответствия требованиям целевого битрейта.\nКогда в энкодере пропадает рамка вместо этого вставьте повторять-последний кадр NAL в стрим.\nМожет помочь с очень низким битрейтом."
+VBAQ="VBAQ"
+VBAQ.Description="Включить функцию \"Дисперсия на основе адаптивного квантования\" (VBAQ) которая основана на дисперсии пикселей для лучшего распространения битрейта.\nФункция работает на идее что зрительная система человека менее чувствительна к артефактам в высоко текстурированных областях и таким образом будет смещать битрейт к гладкой поверхности.\nВключение может привести к улучшению субъективного качества с определенным содержанием."
+EnforceHRD="Принудительно использовать HRD"
+EnforceHRD.Description="Принудительно использовать HRD (Hypothetical Reference Decoder), используемого для проверки выходного потока данных."
+VBVBuffer="Буфер VBV"
+VBVBuffer.Description="Какой метод следует использовать для определения Размера буфера VBV:\n- '\@Utlity.Automatic\@' рассчитывает размер ограничивающийся строгостью,\n- '\@Utlity.Manual\@' позволяет пользователю контролировать размер буфера.\nVBV (Верификатор буферизации видео) буфер используется некоторыми Методами управления скоростью, чтобы сохранить общий битрейт в пределах заданных ограничений."
+VBVBuffer.Strictness="Строгость буфера VBV"
+VBVBuffer.Strictness.Description="Определяет жесткость буфера VBV, при 100% будет максимально жестким и 0% будет неограниченным."
+VBVBuffer.Size="Размер буфера VBV"
+VBVBuffer.Size.Description="Размер буфера VBV, которая используется для управления скорости передачи данных в последовательности."
+VBVBuffer.InitialFullness="Изначальное заполнение буфера VBV"
+VBVBuffer.InitialFullness.Description="Изначальная степень заполнения VBV буфера (в %), будет влиять только на первоначальную последовательность кодирования."
+KeyframeInterval="Интервал ключевых кадров"
+KeyframeInterval.Description="Интервал (в секундах) между ключевыми кадрами."
+H264.IDRPeriod="IDR период (в кадрах)"
+H264.IDRPeriod.Description="Определяет расстояние между Мгновенными обновлениями декодирования (IDR) в кадрах. Так же контролирует размер последовательности GOP."
+H265.IDRPeriod="IDR период (в группах изображений)"
+H265.IDRPeriod.Description="Определяет расстояние между \"Мгновенными обновлениями декодирования\" (IDR) в GOP."
+GOP.Type="Тип GOP"
+GOP.Type.Description="Какой тип GOP должен быть использован:\n- '\@GOP.Type.Fixed\@' всегда будет использовать фиксированные расстояния между каждой GOP.\n- '\@GOP.Type.Variable\@' использует GOP различных размеров, в зависимости от того, какой нужен.\n'\@GOP.Type.Fixed\@' работает так же как устроен H264 и это лучшее решение для трансляции по локальной сети, в то время как '\@GOP.Type.Variable\@' лучше всего подходит для высококачественных записей низкого размера."
+GOP.Type.Fixed="Постоянный"
+GOP.Type.Variable="Переменный"
+GOP.Size="Размер GOP"
+GOP.Size.Description="Размер GOP (группы изображений) в кадрах."
+GOP.Size.Minimum="Минимальный размер GOP"
+GOP.Size.Minimum.Description="Минимальный размер GOP (группы изображений) в кадрах."
+GOP.Size.Maximum="Максимальный размер GOP"
+GOP.Size.Maximum.Description="Максимальный размер GOP (группы изображений) в кадрах."
+GOP.Alignment="Выравнивание GOP"
+GOP.Alignment.Description="Экспериментально, последствия неизвестны. Используйте на свой страх и риск."
+BFrame.Pattern="Структура B-Кадров"
+BFrame.Pattern.Description="Количество B-кадров, используемых при кодировании.\nПоддерживается 2-м и 3-м поколением VCE карт. Негативно влияет на производительность кодирования."
+BFrame.DeltaQP="Отклонение QP B-Кадров"
+BFrame.DeltaQP.Description="Отклонение QP для не опорных B-Кадров, по отношению к последнему I- или P-Кадру."
+BFrame.Reference="Опорный B-Кадр"
+BFrame.Reference.Description="Разрешить B-Кадру так же использовать B-Кадры как ссылки, вместо просто P- и I-Кадров."
+BFrame.ReferenceDeltaQP="Отклонение QP опорных B-кадров"
+BFrame.ReferenceDeltaQP.Description="Значение дельты QP в последних I- или P-Кадрах для ссылаемых B-Кадров."
+DeblockingFilter="Фильтр деблокинга"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/sr-CS.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/sr-CS.ini Changed

@@ -1,47 +1,2 @@
-AMF.Util.Default="Podrazumevano"
-AMF.Util.Automatic="Automatski"
-AMF.Util.Manual="Ručno"
-AMF.Util.Toggle.Disabled="Onemogućeno"
-AMF.Util.Toggle.Enabled="Omogućeno"
-AMF.H264.Preset="Šablon"
-AMF.H264.Preset.ResetToDefaults="Vrati na podrazumevane vrednosti"
-AMF.H264.Preset.Recording="Snimanje"
-AMF.H264.Preset.HighQuality="Visoki kvalitet"
-AMF.H264.Preset.Indistinguishable="Istovetno"
-AMF.H264.Preset.Lossless="Bez gubitaka"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Upotreba"
-AMF.H264.Usage.Description="Za koju upotrebu bi AMF trebao biti podešen:\n- '\@AMF.H264.Usage.Transcoding\@' je transkoding opšte namene (preporučeno),\n- '\@AMF.H264.Usage.UltraLowLatency\@' je za enkoding veoma niskog kašnjenja,\n- '\@AMF.H264.Usage.LowLatency\@' je slično prethodnom sa malo višim kašnjenjem.\nEmitovanje podržava samo '\@AMF.H264.Usage.Transcoding\@', sve ostale vrednosti se mogu koristiti za snimanje."
-AMF.H264.Usage.Transcoding="Transkodiranje"
-AMF.H264.Usage.UltraLowLatency="Ultra nisko kašnjenje"
-AMF.H264.Usage.LowLatency="Nisko kašnjenje"
-AMF.H264.QualityPreset="Šablon kvaliteta"
-AMF.H264.QualityPreset.Description="Koji šablon za kvalitet bi AMF trebao da cilja:\n- '\@AMF.H264.QualityPreset.Speed\@' je najbrži sa najlošijim kvalitetom,\n- '\@AMF.H264.QualityPreset.Balanced\@' je balansiran spoj oba,\n- '\@AMF.H264.QualityPreset.Quality\@' daje najbolji kvalitet za zadati bitrejt."
-AMF.H264.QualityPreset.Speed="Brzina"
-AMF.H264.QualityPreset.Balanced="Izbalansirano"
-AMF.H264.QualityPreset.Quality="Kvalitet"
-AMF.H264.Profile="Profil"
-AMF.H264.Profile.Description="Koji H.264 profil koristiti za enkodiranje:\n- 'Baseline' ima najveću podršku platformi,\n- 'Main' je podržan na starijim uređajima (preporučeno ako se ide ka mobilnim uređajima),\n- 'High' je podržan na aktuelnim uređajima (preporučeno)."
-AMF.H264.ProfileLevel="Nivo profila"
-AMF.H264.RateControlMethod="Metoda kontrole protoka"
-AMF.H264.RateControlMethod.CQP="Konstantan kvalitet (CQP)"
-AMF.H264.RateControlMethod.CBR="Konstantan protok (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Promenjivi protok (sa gornjom granicom) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Promenjivi protok (sa granicom kašnjenja) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Ciljani protok"
-AMF.H264.Bitrate.Peak="Granica protoka"
-AMF.H264.QP.Minimum="Minimalni QP"
-AMF.H264.QP.Maximum="Maksimalni QP"
-AMF.H264.QP.IFrame="I-Frejm QP"
-AMF.H264.QP.PFrame="P-Frejm QP"
-AMF.H264.QP.BFrame="B-Frejm QP"
-AMF.H264.FillerData="Podaci za popunjavanje"
-AMF.H264.FrameSkipping="Preskakanje frejmova"
-AMF.H264.EnforceHRDCompatibility="Prisilna HRD kompatibilnost"
-AMF.H264.DeblockingFilter="Odblokirajući filter"
-AMF.H264.ScanType="Vrsta skeniranja"
-AMF.H264.ScanType.Progressive="Progresivno"
-AMF.H264.ScanType.Interlaced="Isprekidano"
 AMF.H264.MaximumLTRFrames="Maksimalan broj LTR frejmova"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/sv-SE.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/sv-SE.ini Changed

@@ -1,99 +1,128 @@
-AMF.Util.Default="Standard"
-AMF.Util.Automatic="Automatisk"
-AMF.Util.Manual="Manuell"
-AMF.Util.Toggle.Disabled="Inaktiverad"
-AMF.Util.Toggle.Enabled="Aktiverad"
-AMF.H264.Preset="Förinställning"
-AMF.H264.Preset.ResetToDefaults="Återställ till standardvärden"
-AMF.H264.Preset.Recording="Spelar in"
-AMF.H264.Preset.HighQuality="Hög kvalitet"
-AMF.H264.Preset.Indistinguishable="Oskiljbar"
-AMF.H264.Preset.Lossless="Förlustfri"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Användning"
-AMF.H264.Usage.Description="Vilken användning AMF borde vara inställd på:\n- '\@AMF.H264.Usage.Transcoding\@' är för allmän omkodning (rekommenderas),\n- '\@AMF.H264.Usage.UltraLowLatency\@' är för omkodning med riktigt låg latens,\n- '\@AMF.H264.Usage.LowLatency\@' liknar ovanstående men med lite högre latens.\nStrömning stöder endast '\@AMF.H264.Usage.Transcoding\@', alla andra värden kan användas för inspelning."
-AMF.H264.Usage.Transcoding="Omkodning"
-AMF.H264.Usage.UltraLowLatency="Ultralåg latens"
-AMF.H264.Usage.LowLatency="Låg latens"
-AMF.H264.QualityPreset="Kvalitetsförinställning"
-AMF.H264.QualityPreset.Description="Vilken kvalitetsmall AMF bör försöka att uppnå:\n- '\@AMF.H264.QualityPreset.Speed\@' är den snabbaste men har den sämsta kvaliteten,\n- '\@AMF.H264.QualityPreset.Balanced\@' är en balanserad mix av båda,\n- '\@AMF.H264.QualityPreset.Quality\@' ger den bästa kvaliteten för en angiven bithastighet."
-AMF.H264.QualityPreset.Speed="Hastighet"
-AMF.H264.QualityPreset.Balanced="Balanserad"
-AMF.H264.QualityPreset.Quality="Kvalitet"
-AMF.H264.Profile="Profil"
-AMF.H264.Profile.Description="Vilken H.264-profil att använda för kodning:\n- 'Baseline' stödjer flest plattformar,\n- 'Main' stöds av äldre enheter (rekommenderas för mobila enheter),\n- 'High' stöds av aktuella enheter (rekommenderas)."
-AMF.H264.ProfileLevel="Profilnivå"
-AMF.H264.ProfileLevel.Description="Vilken H.264-profilnivå att använda för kodning:\n- '\@AMF.Util.Automatic\@' beräknar den bästa profilnivån för den angivna bildfrekvensen och bildstorleken,\n- '4.1' stöder 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2' stöder 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0' stöder 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1' stöder 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2' stöder 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod.CQP="Konstant QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Konstant bithastighet (CBR)"
-AMF.H264.Bitrate.Target="Målets bithastighet"
-AMF.H264.Bitrate.Target.Description="Bithastighet att försöka uppnå i den övergripande sekvensen."
-AMF.H264.Bitrate.Peak="Maximal bithastighet"
-AMF.H264.QP.Minimum="Minimal QP"
-AMF.H264.QP.Minimum.Description="Lägsta QP-värde att använda i en bildruta."
-AMF.H264.QP.Maximum="Maximal QP"
-AMF.H264.QP.Maximum.Description="Högsta QP-värde att använda i en bildruta."
-AMF.H264.QP.IFrame="QP för I-bildrutor"
-AMF.H264.QP.IFrame.Description="Konstant QP-värde att använda för I-bildrutor."
-AMF.H264.QP.PFrame="QP för P-bildrutor"
-AMF.H264.QP.PFrame.Description="Konstant QP-värde att använda för P-bildrutor."
-AMF.H264.QP.BFrame="QP för B-bildrutor"
-AMF.H264.QP.BFrame.Description="Konstant QP-värde att använda för B-bildrutor."
-AMF.H264.VBVBuffer="VBV-buffert"
-AMF.H264.VBVBuffer.Description="Vilken metod som ska användas för att bestämma VBV-buffertens storlek:\n- '\@AMF.Util.Automatic\@' beräknar storleken med hjälp av en strikt begränsning,\n- '\@AMF.Util.Manual\@' låter användaren kontrollera storleken.\nVBV-buffertern (Video Buffering Verifier) används av vissa Rate Control Methods för att hålla den övergripande bithastigheten inom de angivna begränsningarna."
-AMF.H264.VBVBuffer.Strictness="Strikthet för VBV-buffert"
-AMF.H264.VBVBuffer.Strictness.Description="Bestämmer noggrannheten för VBV-bufferten, där 100% är så noggrann som möjligt och 0% är gränslös."
-AMF.H264.VBVBuffer.Size="VBV-buffertstorlek"
-AMF.H264.FillerData="Fyllningsdata"
-AMF.H264.FillerData.Description="Fyllningsdata låter kodaren behålla önskad bithastighet genom att fylla upp det återstående utrymmet i en sekvens med tom information."
-AMF.H264.FrameSkipping="Hoppa över bildrutor"
-AMF.H264.EnforceHRDCompatibility="Tvinga HRD-kompatibilitet"
-AMF.H264.KeyframeInterval="Intervall för keyframes"
-AMF.H264.KeyframeInterval.Description="Definierar avståndet mellan keyframes i sekunder. Kontrollerar även GOP-sekvensens storlek."
-AMF.H264.IDRPeriod="IDR-period"
-AMF.H264.IDRPeriod.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i bildrutor. Kontrollerar även GOP-sekvensens storlek."
-AMF.H264.BFrame.Pattern="B-bildrutor"
-AMF.H264.DeblockingFilter="Avblockningsfilter"
-AMF.H264.ScanType="Typ av skanning"
-AMF.H264.ScanType.Description="Vilken skanningsmetod att använda, lämna alltid detta på '\@AMF.H264.ScanType.Progressive\@'."
-AMF.H264.ScanType.Progressive="Progressiv"
-AMF.H264.ScanType.Interlaced="Sammanflätad"
-AMF.H264.MotionEstimation="Rörelseuppskattning"
-AMF.H264.MotionEstimation.Description="Rörelseuppskattning låter kodaren reducera nödvändig bithastighet genom att uppskatta var en bildpunkt förflyttas."
-AMF.H264.MotionEstimation.None="Ingen"
-AMF.H264.MotionEstimation.Half="Halv bildpunkt"
-AMF.H264.MotionEstimation.Quarter="Fjärdedels bildpunkt"
-AMF.H264.MotionEstimation.Both="Halv och fjärdedels bildpunkt"
-AMF.H264.CodingType="Kodningstyp"
-AMF.H264.CodingType.Description="Vilken typ av kodning som ska användas:\n* \@AMF.Util.Default\@ låter AMF bestämma (rekommenderas).\n* CALVC (Context-Adaptive Variable-Length Coding) är snabbare, men större.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) är långsammare, men mindre."
+Utility.Default="Standard"
+Utility.Automatic="Automatisk"
+Utility.Manual="Manuell"
+Utility.Switch.Disabled="Inaktiverad"
+Utility.Switch.Enabled="Aktiverad"
+Preset="Förinställning"
+Preset.ResetToDefaults="Återställ till standardvärden"
+Preset.Recording="Spelar in"
+Preset.HighQuality="Hög kvalitet"
+Preset.Indistinguishable="Oskiljbar"
+Preset.Lossless="Förlustfritt"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Användning"
+Usage.Description="Vilken användning AMF borde vara inställd på:\n- '\@Usage.Transcoding\@' är för allmän omkodning (rekommenderas),\n- '\@Usage.UltraLowLatency\@' är för omkodning med riktigt låg latens,\n- '\@Usage.LowLatency\@' liknar ovanstående men med lite högre latens.\nStrömning stöder endast '\@Usage.Transcoding\@', alla andra värden kan användas för inspelning."
+Usage.Transcoding="Omkodning"
+Usage.UltraLowLatency="Ultralåg latens"
+Usage.LowLatency="Låg latens"
+Usage.Webcam="Webbkamera"
+QualityPreset="Kvalitetsförinställning"
+QualityPreset.Description="Vilken kvalitetsmall AMF bör försöka att uppnå:\n- '\@QualityPreset.Speed\@' är den snabbaste men har den sämsta kvaliteten,\n- '\@QualityPreset.Balanced\@' är en balanserad mix av båda,\n- '\@QualityPreset.Quality\@' ger den bästa kvaliteten för en angiven bithastighet."
+QualityPreset.Speed="Hastighet"
+QualityPreset.Balanced="Balanserad"
+QualityPreset.Quality="Kvalitet"
+Profile="Profil"
+Profile.Description="Vilken profil att använda för kodning, sorteras från mest utbrett stöd till högsta kvalitet."
+ProfileLevel="Profilnivå"
+ProfileLevel.Description="Vilken profilnivå att använda för kodning, det är bäst att lämna detta på \@Utility.Automatic\@"
+Tier="Nivå"
+Tier.Description="Vilken nivå att koda på. 'Hög' siktar på hög bithastighet/bandbredd använder medan 'Huvud' siktar på mainstreammedia."
+AspectRatio="Aspektförhållande"
+AspectRatio.Description="Vilket bildförhållande som bör skrivas till utmatningsfilen."
+CodingType="Kodningstyp"
+CodingType.Description="Vilken typ av kodning som ska användas:\n* '\@Utility.Automatic\@' låter AMF bestämma (rekommenderas).\n* 'CALVC' (Context-Adaptive Variable-Length Coding) är snabbare, men större.\n* 'CABAC' (Context-Adaptive Binary Arithmetic Coding) är långsammare, men mindre."
+MaximumReferenceFrames="Maximalt antal referensbildrutor"
+MaximumReferenceFrames.Description="Hur många bildrutor kodaren kan referera som mest under kodning, påverkar kodningskvalitet avsevärt."
+RateControlMethod.CQP="Konstant QP (CQP)"
+RateControlMethod.CBR="Konstant bithastighet (CBR)"
+RateControlMethod.VBR="Varierande bithastighet (begränsat maxvärde) (VBR_LAT)"
+RateControlMethod.VBRLAT="Varierande bithastighet (begränsad latens) (VBR_LAT)"
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (kvarts storlek)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (halv storlek)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (full storlek)"
+Bitrate.Target="Målbithastighet"
+Bitrate.Target.Description="Bithastighet att försöka uppnå i den övergripande sekvensen."
+Bitrate.Peak="Maximal bithastighet"
+Bitrate.Peak.Description="Bithastighet att maximalt försöka uppnå i den övergripande sekvensen."
+QP.IFrame="QP för I-bildrutor"
+QP.IFrame.Description="Konstant QP-värde att använda för I-bildrutor."
+QP.PFrame="QP för P-bildrutor"
+QP.PFrame.Description="Konstant QP-värde att använda för P-bildrutor."
+QP.BFrame="QP för B-bildrutor"
+QP.BFrame.Description="Konstant QP-värde att använda för B-bildrutor."
+QP.Minimum="Minimal QP"
+QP.Minimum.Description="Lägsta QP-värde att använda i en bildruta."
+QP.IFrame.Minimum.Description="Lägsta QP-värde att använda i en I-bildruta."
+QP.PFrame.Minimum.Description="Lägsta QP-värde att använda i en P-bildruta."
+QP.Maximum="Maximal QP"
+QP.Maximum.Description="Högsta QP-värde att använda i en bildruta."
+QP.IFrame.Maximum.Description="Högsta QP-värde att använda i en I-bildruta."
+QP.PFrame.Maximum.Description="Högsta QP-värde att använda i en P-bildruta."
+FillerData="Fyllningsdata"
+FillerData.Description="Fyllningsdata låter kodaren behålla minst \@Bitrate.Target\@ genom att fylla upp det återstående utrymmet i en sekvens med tom information."
+FrameSkipping="Hoppa över bildrutor"
+VBAQ="VBAQ"
+EnforceHRD="Tvinga HRD"
+VBVBuffer="VBV-buffert"
+VBVBuffer.Description="Vilken metod som ska användas för att bestämma VBV-buffertens storlek:\n- '\@Utlity.Automatic\@' beräknar storleken med hjälp av en strikt begränsning,\n- '\@Utlity.Manual\@' låter användaren kontrollera storleken.\nVBV-buffertern (Video Buffering Verifier) används av vissa Rate Control Methods för att hålla den övergripande bithastigheten inom de angivna begränsningarna."
+VBVBuffer.Strictness="Noggrannhet för VBV-buffert"
+VBVBuffer.Strictness.Description="Bestämmer noggrannheten för VBV-bufferten, där 100% är så noggrann som möjligt och 0% är gränslös."
+VBVBuffer.Size="VBV-buffertstorlek"
+VBVBuffer.Size.Description="Storleken för VBV-bufferten som används för bithastighetskontroll i en sekvens."
+VBVBuffer.InitialFullness.Description="Hur full VBV-bufferten är från början (i %), kommer endast påverka den inledande kodningssekvensen."
+KeyframeInterval="Intervall för keyframes"
+KeyframeInterval.Description="Intervall (i sekunder) mellan keyframes."
+H264.IDRPeriod="IDR-period (i bildrutor)"
+H264.IDRPeriod.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i bildrutor. Kontrollerar även GOP-sekvensens storlek."
+H265.IDRPeriod="IDR-period (i GOP)"
+H265.IDRPeriod.Description="Definierar avståndet mellan Instantaneous Decoding Refreshes (IDR) i GOP."
+GOP.Type="GOP-typ"
+GOP.Type.Description="Vilken typ av GOP bör användas:\n- '\@GOP.Type.Fixed\@' kommer alltid använda fasta avstånd mellan varje GOP.\n- '\@GOP.Type.Variable\@' tillåter GOP i olika storlekar, beroende på vad som behövs.\n'\@GOP.Type.Fixed\@' är hur H264-implementeringen fungerar och är bäst för lokal nätverksströmning, medan '\@GOP.Type.Variable\@' är bäst för korta inspelningar i hög kvalitet."
+GOP.Type.Fixed="Konstant"
+GOP.Type.Variable="Variabel"
+GOP.Size="GOP-storlek"
+GOP.Size.Description="Storleken för en GOP (Group Of Pictures) i bildrutor."
+GOP.Size.Minimum="Minimal GOP-storlek"
+GOP.Size.Minimum.Description="Minimal storlek för en GOP (Group Of Pictures) i bildrutor."
+GOP.Size.Maximum="Maximal GOP-storlek"
+GOP.Size.Maximum.Description="Maximal storlek för en GOP (Group Of Pictures) i bildrutor."
+GOP.Alignment="GOP-justering"
+GOP.Alignment.Description="Experimentell. Bieffekterna är okända. Använd på egen risk."
+BFrame.Pattern.Description="Antalet B-bildrutor att använda under kodning.\nStöds av andra och tredje generationens VCE-kort. Påverkar kodningsprestandan negativt."
+BFrame.DeltaQP.Description="Delta QP-värde till den sista I- eller P-bildrutan för icke-referensbara B-bildrutor."
+BFrame.Reference.Description="Låt en B-bildruta också använda B-bildrutor som referens, i stället för bara P- och I-bildrutor."
+BFrame.ReferenceDeltaQP.Description="Delta QP-värde till den sista I- eller P-bildrutan för referensbara B-bildrutor."
+DeblockingFilter="Avblockningsfilter"
+DeblockingFilter.Description="Låter kodaren tillämpa ett avblockeringsfilter."
+MotionEstimation="Rörelseuppskattning"
+MotionEstimation.Description="Rörelseuppskattning låter kodaren reducera nödvändig bithastighet genom att uppskatta var en bildpunkt förflyttas."
+MotionEstimation.Quarter="Fjärdedels bildpunkt"
+MotionEstimation.Half="Halv bildpunkt"
+MotionEstimation.Full="Fjärdedels och halv bildpunkt"
+Video.API="Video-API"
+Video.API.Description="Vilket API bör användas av backend?"
+Video.Adapter="Grafikkort"
+Video.Adapter.Description="På vilken adapter bör vi försöka koda på?"
+OpenCL="OpenCL"
+View="Visningsläge"
+View.Description="Vilka egenskaper bör visas?\nOm '\@View.Master\@' används kommer du inte få någon hjälp."
+View.Basic="Grundläggande"
+View.Advanced="Avancerat"
+View.Expert="Expert"
+View.Master="Mästare"
+Debug="Felsök"
+Debug.Description="Aktivera ytterligare felsökningsmeddelanden. Kräver att du kör Open Broadcaster Software Studio med kommandoraden \"--verbose --log_unfiltered\" (utan citationstecken)."
 AMF.H264.MaximumLTRFrames="Maximalt antal LTR-bildrutor"
+AMF.H264.MaximumAccessUnitSize="Maximal storlek på åtkomstenhet"
+AMF.H264.MaximumAccessUnitSize.Description="Största storleken på en åtkomstenhet för en NAL."
 AMF.H264.HeaderInsertionSpacing.Description="Hur många bildrutor som borde vara mellan NAL-headers."
 AMF.H264.WaitForTask="Väntar på arbetsuppgifter"
 AMF.H264.WaitForTask.Description="Okänd, experimentell"
-AMF.H264.PreAnalysisPass.Description="Okänd, experimentell"
-AMF.H264.VBAQ="VBAQ"
-AMF.H264.VBAQ.Description="Okänd, experimentell"
-AMF.H264.GOPSize="GOP-storlek"
-AMF.H264.GOPSize.Description="Okänd, experimentell"
-AMF.H264.GOPAlignment="GOP-justering"
-AMF.H264.GOPAlignment.Description="Okänd, experimentell"
-AMF.H264.MaximumReferenceFrames.Description="Okänd, experimentell"
 AMF.H264.SliceMode.Description="Okänd, experimentell"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/tr-TR.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/tr-TR.ini Changed

@@ -1,52 +1,7 @@
-AMF.Util.Default="Varsayılan"
-AMF.Util.Automatic="Otomatik"
-AMF.Util.Manual="Elle"
-AMF.Util.Toggle.Disabled="Devre Dışı"
-AMF.Util.Toggle.Enabled="Etkin"
-AMF.H264.Preset="Ön Tanımlı"
-AMF.H264.Preset.ResetToDefaults="Varsayılan Ayarlara Geri Dön"
-AMF.H264.Preset.Recording="Kaydediliyor"
-AMF.H264.Preset.HighQuality="Yüksek Kalite"
-AMF.H264.Preset.Lossless="Kayıpsız"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Kullanım"
-AMF.H264.Usage.UltraLowLatency="Ultra Düşük Gecikme"
-AMF.H264.Usage.LowLatency="Düşük Gecikme"
-AMF.H264.QualityPreset.Speed="Hız"
-AMF.H264.QualityPreset.Balanced="Dengeli"
-AMF.H264.QualityPreset.Quality="Kalite"
-AMF.H264.Profile="Profil"
-AMF.H264.ProfileLevel="Profil Seviyesi"
-AMF.H264.Bitrate.Target="Hedef Bit Hızı"
-AMF.H264.QP.Minimum="Minimum QP"
-AMF.H264.QP.Maximum="Maksimum QP"
-AMF.H264.VBVBuffer.Size="VBV Arabellek Boyutu"
-AMF.H264.FrameSkipping="Kare Atlama"
-AMF.H264.ScanType="Tarama Türü"
-AMF.H264.MotionEstimation.None="Hiçbiri"
-AMF.H264.MotionEstimation.Half="Yarım Piksel"
-AMF.H264.MotionEstimation.Quarter="Çeyrek Piksel"
-AMF.H264.MotionEstimation.Both="Yarım ve Çeyrek Piksel"
 AMF.H264.WaitForTask.Description="Bilinmeyen, Deneysel"
-AMF.H264.PreAnalysisPass.Description="Bilinmeyen, Deneysel"
-AMF.H264.VBAQ="VBAQ"
-AMF.H264.VBAQ.Description="Bilinmeyen, Deneysel"
-AMF.H264.GOPSize.Description="Bilinmeyen, Deneysel"
-AMF.H264.GOPAlignment.Description="Bilinmeyen, Deneysel"
-AMF.H264.MaximumReferenceFrames.Description="Bilinmeyen, Deneysel"
 AMF.H264.SliceMode.Description="Bilinmeyen, Deneysel"
 AMF.H264.MaximumSliceSize.Description="Bilinmeyen, Deneysel"
 AMF.H264.SliceControlMode.Description="Bilinmeyen, Deneysel"
 AMF.H264.SliceControlSize.Description="Bilinmeyen, Deneysel"
 AMF.H264.IntraRefresh.NumberOfStripes.Description="Bilinmeyen, Deneysel"
-AMF.H264.VideoAPI="Video API"
-AMF.H264.VideoAdapter="Ekran Kartı"
-AMF.H264.OpenCL="OpenCL"
-AMF.H264.View="Görüntüleme Modu"
-AMF.H264.View.Basic="Temel"
-AMF.H264.View.Advanced="Gelişmiş"
-AMF.H264.View.Expert="Uzman"
-AMF.H264.View.Master="Usta"
-AMF.H264.Debug="Hata Ayıklama"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/uk-UA.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/uk-UA.ini Changed

@@ -1,115 +1,144 @@
-AMF.Util.Default="За замовчанням"
-AMF.Util.Automatic="Автоматично"
-AMF.Util.Manual="Вручну"
-AMF.Util.Toggle.Disabled="Вимкнено"
-AMF.Util.Toggle.Enabled="Увімкнено"
-AMF.H264.Preset="Шаблон"
-AMF.H264.Preset.ResetToDefaults="Відновити параметри за замовчанням"
-AMF.H264.Preset.Recording="Звичайний запис"
-AMF.H264.Preset.HighQuality="Висока якість"
-AMF.H264.Preset.Indistinguishable="Якість майже без втрат"
-AMF.H264.Preset.Lossless="Без втрат якості"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Використання"
-AMF.H264.Usage.Description="Тип використання AMF або напрямок його використання, тобто:\n  'Для перекодування' - загальний тип налаштувань (рекомендований).\n  'З ультра-низькою затримкою' - тип лише для дійсно низької затримки під час кодування.\n  'З низькою затримкою' - схожий на зазначений вище, але з трохи більшою затримкою.\n\nТрансляції підтримують лише напрямок використання 'Для перекодування'."
-AMF.H264.Usage.Transcoding="Для перекодування"
-AMF.H264.Usage.UltraLowLatency="З ультра-низькою затримкою"
-AMF.H264.Usage.LowLatency="З низькою затримкою"
-AMF.H264.QualityPreset="Шаблон якості"
-AMF.H264.QualityPreset.Description="Визначає який Шаблон якості AMF намагатиметься встановити:\n  'Швидкість' - є найшвидшим, але має гіршу якість відео.\n  'Збалансований' - це баланс між шаблонами Швидкість та Якість.\n  'Якість' - дає найкращу якість відео для заданого бітрейту."
-AMF.H264.QualityPreset.Speed="Швидкість"
-AMF.H264.QualityPreset.Balanced="Збалансований"
-AMF.H264.QualityPreset.Quality="Якість"
-AMF.H264.Profile="Профіль"
-AMF.H264.Profile.Description="Зазначений профіль H.264 буде використано енкодером:\n  'Baseline' - найпоширеніший серед пристроїв відтворення\n  'Main' - майже всі пристрої відтворення мають підтримку цього профілю\n  'High' - профіль підтримується найсучаснішими пристроями (рекомендується)."
-AMF.H264.ProfileLevel="Рівень профілю"
-AMF.H264.ProfileLevel.Description="Визначає рівень профілю H.264 який буде використано під час кодування:\n  'Автоматично' - програма сама встановить найкращій рівень профілю згідно розміру та частоти кадрів,\n  '4.1' - підтримує 1920x1080 30 кадрів/с, 1280x720 60 кадрів/с, 960x540 90 кадрів/с\n  '4.2' - підтримує 1920x1080 60 кадрів/с, 1280x720 120 кадрів/с, 960x540 172 кадрів/с\n  '5.0' - підтримує 1920x1080 60 кадрів/с, 1280x720 144 кадрів/с, 960x540 172 кадрів/с\n  '5.1' - підтримує 3840x2160 30 кадрів/с, 1920x1080 120 кадрів/с, 1280x720 172 кадрів/с, 960x540 172 кадрів/с\n  '5.2' - підтримує 3840x2160 60 кадрів/с, 1920x1080 172 кадрів/с, 1280x720 172 кадрів/с, 960x540 172 кадрів/с"
-AMF.H264.RateControlMethod="Метод керування потоком"
-AMF.H264.RateControlMethod.Description="Визначає метод керування потоком:\n  'Фіксований QP (CQP)' - встановлює фіксовані QP для I-/P-/B-кадрів,\n  'Постійний бітрейт (CBR)' - дотримується значення Бажаний бітрейт потоку (використовуючи\nопцію Заповнювати пустоти у бітрейту) (рекомендується для трансляцій),\n  'Змінний бітрейт (максимальний бітрейт обмежено) (VBR)' - потік завжди залишається нижче значення Максимальний бітрейт,\n  'Змінний бітрейт (затримку обмежено) (VBR_LAT)' - потік буде збережено близько до значення Бажаний бітрейт,\nдопоки затримка графічного адаптеру та навантаження на нього дозволятимуть це,\nв іншому випадку бітрейт буде збільшено (рекомендується для запису).\n\nQP - Quantization Parameter (параметр квантування)."
-AMF.H264.RateControlMethod.CQP="Фіксований QP (CQP)"
-AMF.H264.RateControlMethod.CBR="Постійний бітрейт (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Змінний бітрейт (максимальний бітрейт обмежено) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Змінний бітрейт (затримку обмежено) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Бажаний бітрейт"
-AMF.H264.Bitrate.Target.Description="Енкодер буде намагатися дотримуватись цього бітрейту."
-AMF.H264.Bitrate.Peak="Максимальний бітрейт"
-AMF.H264.Bitrate.Peak.Description="Енкодер буде намагатися не перевищувати цього бітрейту."
-AMF.H264.QP.Minimum="Мінімальний QP"
-AMF.H264.QP.Minimum.Description="Найнижчий QP (параметр квантування) в кадрі."
-AMF.H264.QP.Maximum="Максимальний QP"
-AMF.H264.QP.Maximum.Description="Найвищий QP (параметр квантування) в кадрі."
-AMF.H264.QP.IFrame="QP для I-кадрів"
-AMF.H264.QP.IFrame.Description="Фіксоване значення QP (параметр квантування) для I-кадрів."
-AMF.H264.QP.PFrame="QP для P-кадрів"
-AMF.H264.QP.PFrame.Description="Фіксоване значення QP (параметр квантування) для P-кадрів."
-AMF.H264.QP.BFrame="QP для B-кадрів"
-AMF.H264.QP.BFrame.Description="Фіксоване значення QP (параметр квантування) для B-кадрів."
-AMF.H264.VBVBuffer="Буфер VBV"
-AMF.H264.VBVBuffer.Description="Метод, що використовується для визначення параметру Розмір VBV буфера:\n  'Автоматично' - енкодер вираховує розмір враховуючи параметр Буфер VBV, кореляція.\n  'Вручну' - дозволяє користувачеві контролювати цей розмір.\nVBV (Video Buffering Verifier) Буфер використовується різними Методами керування потоком для збереження бітрейту у зазначених межах."
-AMF.H264.VBVBuffer.Strictness="Буфер VBV, кореляція"
-AMF.H264.VBVBuffer.Strictness.Description="Визначає як близько значення Буфер VBV дорівнює заданому, у відсотках."
-AMF.H264.VBVBuffer.Size="Розмір VBV буфера"
-AMF.H264.VBVBuffer.Size.Description="Розмір VBV буфера (Video Buffering Verifier) використовується під час контролю бітрейта відео."
-AMF.H264.VBVBuffer.Fullness="Початкова повнота буферу VBV"
-AMF.H264.VBVBuffer.Fullness.Description="Визначає початкову заповнюваність Буферу VBV, діє лише на початку кодування."
-AMF.H264.FillerData="Заповнювати пустоти у бітрейту"
-AMF.H264.FillerData.Description="Заповнювати пустоти у бітрейту - це наповнювання інформацією, яку декодер просто ігнорує. Якщо увімкнено то зайве місце у бітрейті буде заповнено нічого не значущою інформацією за для досягнення точного значення Бажаний бітрейт. Аналог Filler Data."
-AMF.H264.FrameSkipping="Пропускати кадри"
-AMF.H264.FrameSkipping.Description="Пропускати кадри - дозволяє енкодеру відкидати кадри, якщо керування потоком не може досягти встановленого значення Бажаний бітрейт.\nКоли енкодер пропускає кадр, він додає дублювати-останній-кадр NAL до потоку.\nМоже допомогти при встановленні дуже низьких значень Бажаний бітрейт."
-AMF.H264.EnforceHRDCompatibility="Застосувати примусову сумісність з HRD"
-AMF.H264.EnforceHRDCompatibility.Description="Застосувати примусову сумісність з HRD (Hypothetical Reference Decoder) - накладає обмеження на максимальне значення QP (параметра квантування) у кадрі задля досягнення сумісності з HRD.\nНе рекомендується для записів або трансляцій. Використовувати лише для сумісності з найстарішими пристроями які мають лише базовий декодер."
-AMF.H264.KeyframeInterval="Інтервал ключових кадрів"
-AMF.H264.KeyframeInterval.Description="Визначає кількість секунд між двома повними кадрами (ключовими кадрами).\nТакож контролює довжину послідовності кадрів у групі зображень (GOP)."
-AMF.H264.IDRPeriod="IDR, період (кадрів)"
-AMF.H264.IDRPeriod.Description="Визначає відстань між Instantaneous Decoding Refreshes (IDR) (ключовими кадрами), в кадрах.\nТакож контролює довжину послідовності кадрів у групі зображень (GOP)."
-AMF.H264.BFrame.Pattern="B-кадри"
-AMF.H264.BFrame.Pattern.Description="Визначає кількість послідовних B-кадрів у кодуванні.\nПідтримується принаймні 2-м та 3-м поколінням VCE карт. Маєнегативний вплив на продуктивність."
-AMF.H264.BFrame.DeltaQP="B-кадри, відхил QP"
-AMF.H264.BFrame.DeltaQP.Description="Відхил QP (параметра квантування) для не опорних B-кадрів, по відношенню до I-кадрів та P-кадрів."
-AMF.H264.BFrame.Reference="B-кадри як опорні"
-AMF.H264.BFrame.Reference.Description="Дозволяє робити B-кадри опорними для інших B-кадрів в додаток до вже існуючих P- та I-кадрів."
-AMF.H264.BFrame.ReferenceDeltaQP="Відхил QP (параметра квантування) для опорних B-кадрів"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="Відхил QP (параметра квантування) для опорних B-кадрів, по відношенню до I-кадрів та P-кадрів."
-AMF.H264.DeblockingFilter="Деблокінг-фільтр"
-AMF.H264.DeblockingFilter.Description="Встановлює позначку, що дозволяє декодеру використовувати Деблокінг-фільтр для цього відео."
-AMF.H264.ScanType="Вид розгортки"
-AMF.H264.ScanType.Description="Визначає вид розгортки який треба використовувати у кодуванні,\nзавжди користуйтеся значенням 'Прогресивна'."
-AMF.H264.ScanType.Progressive="Прогресивна"
-AMF.H264.ScanType.Interlaced="Черезрядкова"
-AMF.H264.MotionEstimation="Оцінка руху"
-AMF.H264.MotionEstimation.Description="Оцінка руху дозволяє енкодеру зменшити вимоги до бітрейту завдяки розрахункам з переміщення пікселів."
-AMF.H264.MotionEstimation.None="Немає"
-AMF.H264.MotionEstimation.Half="Пів-пікселя"
-AMF.H264.MotionEstimation.Quarter="Чверть-пікселя"
-AMF.H264.MotionEstimation.Both="Пів-пікселя та Чверть-пікселя"
-AMF.H264.CodingType="Схема кодування"
-AMF.H264.CodingType.Description="Визначає яку схему кодування використовувати:\n  'За замовчанням' - програма вирішує самостійно (рекомендується).\n  'CABAC' - контекстно-залежне адаптивне бінарне арифметичне кодування, схема має кращу компресію даних, але здійснює більше навантаження.\n  'CAVLC' - контекстно-залежне адаптивне кодування із змінною довжиною кодового слова, схема має дещо меншу компресію даних, але й здійснює менше навантаження."
+Utility.Default="За замовчанням"
+Utility.Automatic="Автоматично"
+Utility.Manual="Вручну"
+Utility.Switch.Disabled="Вимкнено"
+Utility.Switch.Enabled="Увімкнено"
+Preset="Шаблон"
+Preset.ResetToDefaults="Відновити параметри за замовчанням"
+Preset.Recording="Звичайний запис"
+Preset.HighQuality="Висока якість"
+Preset.Indistinguishable="Якість майже без втрат"
+Preset.Lossless="Без втрат якості"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Використання"
+Usage.Description="Тип використання AMF або напрямок його використання, тобто:\n  'Для перекодування' - загальний тип налаштувань (рекомендований).\n  'З ультра-низькою затримкою' - тип лише для дійсно низької затримки під час кодування.\n  'З низькою затримкою' - схожий на зазначений вище, але з трохи більшою затримкою.\n\nТрансляції підтримують лише напрямок використання 'Для перекодування'."
+Usage.Transcoding="Для перекодування"
+Usage.UltraLowLatency="З ультра-низькою затримкою"
+Usage.LowLatency="З низькою затримкою"
+Usage.Webcam="Для вебкамери"
+QualityPreset="Шаблон якості"
+QualityPreset.Description="Визначає який Шаблон якості AMF намагатиметься встановити:\n  'Швидкість' - є найшвидшим, але має гіршу якість відео.\n  'Збалансований' - це баланс між шаблонами Швидкість та Якість.\n  'Якість' - дає найкращу якість відео для заданого бітрейту."
+QualityPreset.Speed="Швидкість"
+QualityPreset.Balanced="Збалансований"
+QualityPreset.Quality="Якість"
+Profile="Профіль"
+Profile.Description="Зазначений профіль буде використано енкодером. Від того що має найвищу сумісність (вище) до найвищої якості (нижче)."
+ProfileLevel="Рівень профілю"
+ProfileLevel.Description="Визначає рівень профілю який буде використано під час кодування. 'Автоматично' - програма сама встановить найкращій рівень."
+Tier="Рівень додатку"
+Tier.Description="Рівень додатку (або Tier). 'High' використовується для змісту з високим бітрейтом або професійне використання, тоді як 'Main' застосовується в усіх інших випадках."
+AspectRatio="Пропорції"
+AspectRatio.Description="Співвідношення сторін яке буде записано до файлу Виводу."
+CodingType="Схема кодування"
+CodingType.Description="Визначає яку схему кодування використовувати:\n  'За замовчанням' - програма вирішує самостійно (рекомендується).\n  'CABAC' - контекстно-залежне адаптивне бінарне арифметичне кодування, схема має кращу компресію даних, але здійснює більше навантаження.\n  'CAVLC' - контекстно-залежне адаптивне кодування із змінною довжиною кодового слова, схема має дещо меншу компресію даних, але й здійснює менше навантаження."
+MaximumReferenceFrames="Максимальна кількість опорних кадрів"
+MaximumReferenceFrames.Description="Визначає яку кількість кадрів дозволено енкодеру використовувати у якості опорних. Має безпосередній вплив на якість кодування."
+RateControlMethod="Метод керування потоком"
+RateControlMethod.Description="Визначає метод керування потоком:\n  'Фіксований QP (CQP)' - встановлює фіксовані QP для I-/P-/B-кадрів,\n  'Постійний бітрейт (CBR)' - дотримується значення Бажаний бітрейт потоку (використовуючи\nопцію Заповнювати пустоти у бітрейту) (рекомендується для трансляцій),\n  'Змінний бітрейт (максимальний бітрейт обмежено) (VBR)' - потік завжди залишається нижче значення Максимальний бітрейт,\n  'Змінний бітрейт (затримку обмежено) (VBR_LAT)' - потік буде збережено близько до значення Бажаний бітрейт,\nдопоки затримка графічного адаптеру та навантаження на нього дозволятимуть це,\nв іншому випадку бітрейт буде збільшено (рекомендується для запису).\n\nQP - Quantization Parameter (параметр квантування)."
+RateControlMethod.CQP="Фіксований QP (CQP)"
+RateControlMethod.CBR="Постійний бітрейт (CBR)"
+RateControlMethod.VBR="Змінний бітрейт (максимальний бітрейт обмежено) (VBR)"
+RateControlMethod.VBRLAT="Змінний бітрейт (затримку обмежено) (VBR_LAT)"
+PrePassMode="Попередній прохід"
+PrePassMode.Description="Це ще один прохід енкодера, що дозволяє ще компактніше розташувати блоки даних у наданому бітрейту. Ефективність методу залежить від апаратного забезпечення."
+PrePassMode.Quarter="Увімкнено (на чверть від повного розміру)"
+PrePassMode.Half="Увімкнено (на половину від повного розміру)"
+PrePassMode.Full="Увімкнено (на повний розмір)"
+Bitrate.Target="Бажаний бітрейт"
+Bitrate.Target.Description="Енкодер буде намагатися дотримуватись цього бітрейту."
+Bitrate.Peak="Максимальний бітрейт"
+Bitrate.Peak.Description="Енкодер буде намагатися не перевищувати цього бітрейту."
+QP.IFrame="QP для I-кадрів"
+QP.IFrame.Description="Фіксоване значення QP (параметр квантування) для I-кадрів."
+QP.PFrame="QP для P-кадрів"
+QP.PFrame.Description="Фіксоване значення QP (параметр квантування) для P-кадрів."
+QP.BFrame="QP для B-кадрів"
+QP.BFrame.Description="Фіксоване значення QP (параметр квантування) для B-кадрів."
+QP.Minimum="Мінімальний QP"
+QP.Minimum.Description="Найнижчий QP (параметр квантування) в кадрі."
+QP.IFrame.Minimum="Мінімальний QP для I-кадрів"
+QP.IFrame.Minimum.Description="Найнижчий QP (параметр квантування) для I-кадрів."
+QP.PFrame.Minimum="Мінімальний QP для P-кадрів"
+QP.PFrame.Minimum.Description="Найнижчий QP (параметр квантування) для P-кадрів."
+QP.Maximum="Максимальний QP"
+QP.Maximum.Description="Найвищий QP (параметр квантування) в кадрі."
+QP.IFrame.Maximum="Максимальний QP для I-кадрів"
+QP.IFrame.Maximum.Description="Найвищий QP (параметр квантування) для I-кадрів."
+QP.PFrame.Maximum="Максимальний QP для P-кадрів"
+QP.PFrame.Maximum.Description="Найвищий QP (параметр квантування) для P-кадрів."
+FillerData="Заповнювати пустоти у бітрейту"
+FillerData.Description="Заповнювати пустоти у бітрейту - це наповнювання інформацією, яку декодер просто ігнорує. Якщо увімкнено, то зайве місце у бітрейті буде заповнено нічого не значущою інформацією за для дотримання точного значення Бажаний бітрейт. Аналог Filler Data."
+FrameSkipping="Пропускати кадри"
+FrameSkipping.Description="Пропускати кадри - дозволяє енкодеру відкидати кадри, якщо керування потоком не може досягти встановленого значення Бажаний бітрейт.\nКоли енкодер пропускає кадр, він додає дублювати-останній-кадр NAL до потоку.\nМоже допомогти при встановленні дуже низьких значень Бажаний бітрейт."
+VBAQ="VBAQ"
+VBAQ.Description="Увімкнути використання функції Variance Based Adaptive Quantization (VBAQ), яка базується на дисперсії пікселів задля кращого використання наявного бітрейту.\nЗаощаджує на комплексних текстурах, до яких око людини менш чутливе, на користь плавних переходів в інших місцях.\nЗа рахунок цього, може дещо поліпшити якість зображення."
+EnforceHRD="Застосувати примусову сумісність з HRD"
+EnforceHRD.Description="Застосувати примусову сумісність з HRD (Hypothetical Reference Decoder) - накладає обмеження на енкодер задля забезпечення норм стандартного потоку."
+VBVBuffer="Буфер VBV"
+VBVBuffer.Description="Метод, що використовується для визначення параметру Розмір VBV буфера:\n  'Автоматично' - енкодер вираховує розмір враховуючи параметр Буфер VBV, кореляція.\n  'Вручну' - дозволяє користувачеві контролювати цей розмір.\n\nVBV (Video Buffering Verifier) Буфер використовується різними Методами керування потоком для збереження бітрейту у зазначених межах."
+VBVBuffer.Strictness="Буфер VBV, кореляція"
+VBVBuffer.Strictness.Description="Визначає як близько значення Буфер VBV дорівнює заданому, у відсотках."
+VBVBuffer.Size="Розмір VBV буфера"
+VBVBuffer.Size.Description="Розмір VBV буфера (Video Buffering Verifier) використовується під час контролю бітрейта відео."
+VBVBuffer.InitialFullness="Початкова повнота буферу VBV"
+VBVBuffer.InitialFullness.Description="Визначає початкову заповнюваність Буферу VBV (у відсотках), діє лише на початку кодування."
+KeyframeInterval="Інтервал ключових кадрів"
+KeyframeInterval.Description="Визначає кількість секунд між двома повними кадрами (ключовими кадрами)."
+H264.IDRPeriod="IDR, період (кадрів)"
+H264.IDRPeriod.Description="Визначає відстань між Instantaneous Decoding Refreshes (IDR) (ключовими кадрами), в кадрах.\nТакож контролює довжину послідовності кадрів у групі зображень (GOP)."
+H265.IDRPeriod="IDR, період (групи зображень)"
+H265.IDRPeriod.Description="Визначає відстань між Instantaneous Decoding Refreshes (IDR) (ключовими кадрами), тут вимірюється у кількості груп зображень (GOP) між двома IDR."
+GOP.Type="Тип розміру GOP"
+GOP.Type.Description="Визначає який тип розміру групи зображень (GOP) буде використано у кодуванні:\n  'Фіксований' - постійна відстань між двома групами зображень.\n  'Змінний' - розмір кожної групи зображень може змінюватись у часі.\nФіксований розмір групи зображень є часткою стандарту H.264 та найбільш відповідає трансляціям, у той час як Змінний розмір групи зображень краще застосовувати у високоякісних записах малого розміру."
+GOP.Type.Fixed="Фіксований"
+GOP.Type.Variable="Змінний"
+GOP.Size="Розмір GOP"
+GOP.Size.Description="Розмір групи зображень (GOP), у кадрах."
+GOP.Size.Minimum="Мінімальний розмір GOP"
+GOP.Size.Minimum.Description="Мінімальний розмір групи зображень (GOP), у кадрах."
+GOP.Size.Maximum="Максимальний розмір GOP"
+GOP.Size.Maximum.Description="Максимальний розмір групи зображень (GOP), у кадрах."
+GOP.Alignment="Вирівнювання GOP"
+GOP.Alignment.Description="Експериментально, ефект не відомо. Використовувати лише на свій страх і ризик."
+BFrame.Pattern="Послідовні B-кадри"
+BFrame.Pattern.Description="Визначає кількість послідовних B-кадрів у кодуванні.\nПідтримується принаймні 2-м та 3-м поколінням VCE карт. Має негативний вплив на продуктивність."
+BFrame.DeltaQP="B-кадри, відхил QP"
+BFrame.DeltaQP.Description="Відхил QP (параметра квантування) для не опорних B-кадрів, по відношенню до I-кадрів та P-кадрів."
+BFrame.Reference="B-кадри як опорні"
+BFrame.Reference.Description="Дозволяє робити B-кадри опорними для інших B-кадрів в додаток до вже існуючих P- та I-кадрів."
+BFrame.ReferenceDeltaQP="Відхил QP для опорних B-кадрів"
+BFrame.ReferenceDeltaQP.Description="Відхил QP (параметра квантування) для опорних B-кадрів, по відношенню до I-кадрів та P-кадрів."
+DeblockingFilter="Деблокінг-фільтр"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/vi-VN.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/vi-VN.ini Changed

@@ -1,64 +1,93 @@
-AMF.Util.Default="Mặc định"
-AMF.Util.Automatic="Tự động"
-AMF.Util.Manual="Thủ công"
-AMF.Util.Toggle.Disabled="Tắt"
-AMF.Util.Toggle.Enabled="Bật"
-AMF.H264.Preset="Mẫu thiết lập"
-AMF.H264.Preset.ResetToDefaults="Thiết lập về mặc định"
-AMF.H264.Preset.Recording="Quay video"
-AMF.H264.Preset.HighQuality="Chất lượng cao"
-AMF.H264.Preset.Indistinguishable="Không thể phân biệt"
-AMF.H264.Preset.Lossless="Lossless"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="Sử dụng"
-AMF.H264.Usage.Transcoding="Chuyển mã"
-AMF.H264.Usage.UltraLowLatency="Độ trễ cực thấp"
-AMF.H264.Usage.LowLatency="Độ trễ thấp"
-AMF.H264.QualityPreset="Quality Preset"
-AMF.H264.QualityPreset.Speed="Tốc độ"
-AMF.H264.QualityPreset.Balanced="Cân bằng"
-AMF.H264.QualityPreset.Quality="Chất lượng"
-AMF.H264.Profile="Profile"
-AMF.H264.ProfileLevel="Profile Level"
-AMF.H264.RateControlMethod="Cách kiểm soát Bitrate"
-AMF.H264.RateControlMethod.CQP="QP Không thay đổi (CQP)"
-AMF.H264.RateControlMethod.CBR="Bitrate Không thay đổi (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="Bitrate Thay đổi được (Phụ thuộc vào Bitrate Cao nhất) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="Bitrate Thay đổi được (Phụ thuộc vào độ trễ) (VBR_LAT)"
-AMF.H264.Bitrate.Target="Bitrate Mục tiêu"
-AMF.H264.Bitrate.Peak="Bitrate Cao nhất"
-AMF.H264.QP.Minimum="QP Thấp nhất"
-AMF.H264.QP.Maximum="QP Cao nhất"
-AMF.H264.QP.IFrame="I-Frame QP"
-AMF.H264.QP.PFrame="P-Frame QP"
-AMF.H264.QP.BFrame="B-Frame QP"
-AMF.H264.FillerData="Filler Data (Thêm data cho đủ bitrate)"
-AMF.H264.FrameSkipping="Frame Skipping"
-AMF.H264.EnforceHRDCompatibility="Enforce HRD Compatibility"
-AMF.H264.KeyframeInterval="Thời gian đặt keyframe"
-AMF.H264.DeblockingFilter="De-blocking Filter (Lọc chống nhiễu ảnh)"
-AMF.H264.ScanType="Quét hình loại"
-AMF.H264.ScanType.Progressive="Quét nguyên ảnh (Progressive)"
-AMF.H264.ScanType.Interlaced="Quét 1/2 ảnh (Interlaced)"
-AMF.H264.MotionEstimation="Dự đoán bù trừ chuyển động"
-AMF.H264.MotionEstimation.Description="Dự toán chuyển động cho phép bộ mã hóa giảm bitrate cần thiết bằng cách ước tính một pixel sẽ đi đâu."
-AMF.H264.MotionEstimation.None="Không"
-AMF.H264.MotionEstimation.Half="1/2 Pixel"
-AMF.H264.MotionEstimation.Quarter="1/4 Pixel"
-AMF.H264.MotionEstimation.Both="1/2 và 1/4 Pixel"
-AMF.H264.CodingType="Coding Type"
+Utility.Default="Mặc định"
+Utility.Automatic="Tự động"
+Utility.Manual="Thủ công"
+Utility.Switch.Disabled="Tắt"
+Utility.Switch.Enabled="Bật"
+Preset="Mẫu thiết lập"
+Preset.ResetToDefaults="Thiết lập về mặc định"
+Preset.Recording="Quay video"
+Preset.HighQuality="Chất lượng cao"
+Preset.Indistinguishable="Không thể phân biệt"
+Preset.Lossless="Lossless"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="Sử dụng"
+Usage.Transcoding="Chuyển mã"
+Usage.UltraLowLatency="Độ trễ cực thấp"
+Usage.LowLatency="Độ trễ thấp"
+Usage.Webcam="Webcam"
+QualityPreset="Quality Preset"
+QualityPreset.Speed="Tốc độ"
+QualityPreset.Balanced="Cân bằng"
+QualityPreset.Quality="Chất lượng"
+Profile="Hồ sơ"
+ProfileLevel="Profile Level"
+AspectRatio="Tỉ lệ"
+CodingType="Coding Type"
+RateControlMethod="Cách kiểm soát Bitrate"
+RateControlMethod.CQP="QP Không thay đổi (CQP)"
+RateControlMethod.CBR="Bitrate Không thay đổi (CBR)"
+RateControlMethod.VBR="Bitrate Thay đổi được (Phụ thuộc vào Bitrate Cao nhất) (VBR)"
+RateControlMethod.VBRLAT="Bitrate Thay đổi được (Phụ thuộc vào độ trễ) (VBR_LAT)"
+PrePassMode="Pre-Pass Mode"
+Bitrate.Target="Bitrate Mục tiêu"
+Bitrate.Peak="Bitrate Cao nhất"
+QP.IFrame="I-Frame QP"
+QP.PFrame="P-Frame QP"
+QP.BFrame="B-Frame QP"
+QP.Minimum="QP Thấp nhất"
+QP.Minimum.Description="Giá trị QP nhỏ nhất sử dụng trong 1 khung ảnh."
+QP.IFrame.Minimum="I-Frame QP Thấp nhất"
+QP.IFrame.Minimum.Description="Giá trị QP nhỏ nhất sử dụng trong 1 I-Frame."
+QP.PFrame.Minimum="P-Frame QP Thấp nhất"
+QP.PFrame.Minimum.Description="Giá trị QP nhỏ nhất sử dụng trong 1 P-Frame."
+QP.Maximum="QP Cao nhất"
+QP.Maximum.Description="Giá trị QP lớn nhất sử dụng trong 1 khung ảnh."
+QP.IFrame.Maximum="I-Frame QP Cao nhất"
+QP.IFrame.Maximum.Description="Giá trị QP lớn nhất sử dụng trong 1 I-Frame."
+QP.PFrame.Maximum="P-Frame QP Cao nhất"
+QP.PFrame.Maximum.Description="Giá trị QP lớn nhất sử dụng trong P-Frame."
+FillerData="Filler Data (Thêm data cho đủ bitrate)"
+FillerData.Description="Bật Filler Data cho phép bộ mã hóa giữ ít nhất \@Bitrate.Target\@ bằng cách điền vào không gian còn lại trong một chuỗi thông tin trống."
+VBAQ="VBAQ"
+EnforceHRD="Ép sử dụng HRD"
+KeyframeInterval="Thời gian đặt keyframe"
+KeyframeInterval.Description="Khoảng thời gian (bằng giây) giữa các khung hình."
+GOP.Type="Loại GOP"
+GOP.Type.Fixed="Cố định"
+GOP.Type.Variable="Biến"
+GOP.Size="Kích cỡ GOP"
+GOP.Size.Description="Kích thước của một GOP (Nhóm ảnh) trong khung hình."
+GOP.Size.Minimum="Kích thước GOP tối thiểu"
+GOP.Size.Minimum.Description="Kích thước tối thiểu của một GOP (Nhóm ảnh) trong khung hình."
+GOP.Size.Maximum="Kích thước GOP tối đa"
+GOP.Size.Maximum.Description="Kích thước tối đa của một GOP (Nhóm ảnh) trong khung hình."
+GOP.Alignment.Description="Thử nghiệm, kết quả chưa biết. Dùng nó có thể tạo một số rủi ro."
+DeblockingFilter="De-blocking Filter (Lọc chống nhiễu ảnh)"
+DeblockingFilter.Description="Cho phép bộ giải mã áp dụng lọc chống nhiễu ảnh."
+MotionEstimation="Dự đoán bù trừ chuyển động"
+MotionEstimation.Description="Dự đoán bù trừ chuyển động cho phép bộ mã hóa giảm bitrate cần thiết bằng cách ước tính một pixel sẽ đi đâu."
+MotionEstimation.Quarter="1/4 Pixel"
+MotionEstimation.Half="1/2 Pixel"
+MotionEstimation.Full="1/4 & 1/2 Pixel"
+Video.API="Video API"
+Video.Adapter="Card đồ họa"
+OpenCL="OpenCL"
+OpenCL.Description="Nên sử dụng OpenCL để gửi các khung? Về mặt kỹ thuật thì nhanh hơn nhưng có thể gây ra vấn đề với driver của Intel (do thư viện OpenCL không tương thích)."
+View="Chế độ xem"
+View.Description="Những thuộc tính gì sẽ được hiển thị?\nNếu sử dụng '\@View.Master\@' thì bạn sẽ không nhận được hỗ trợ."
+View.Basic="Cơ bản"
+View.Advanced="Nâng cao"
+View.Expert="Chuyên gia"
+View.Master="Bật cả tính năng ẩn"
+Debug="Gỡ lỗi"
+Debug.Description="Cho phép hiện thông báo gỡ lỗi bổ sung. Đòi hỏi bạn phải chạy Open Broadcaster Software Studio với dòng lệnh --verbose --log_unfiltered."
 AMF.H264.MaximumLTRFrames="LTR Frames tối đa"
-AMF.H264.GOPSize="Kích cỡ GOP"
-AMF.H264.GOPSize.Description="Không rõ, thử nghiệm"
+AMF.H264.WaitForTask.Description="Không rõ, thử nghiệm"
 AMF.H264.SlicesPerFrame="Lát cho mỗi khung hình"
-AMF.H264.VideoAPI="Video API"
-AMF.H264.VideoAdapter="Card đồ họa"
-AMF.H264.OpenCL="OpenCL"
-AMF.H264.View="Chế độ xem"
-AMF.H264.View.Basic="Cơ bản"
-AMF.H264.View.Advanced="Nâng cao"
-AMF.H264.View.Expert="Chuyên gia"
-AMF.H264.View.Master="Bật cả tính năng ẩn"
-AMF.H264.Debug="Gỡ lỗi"
+AMF.H264.SliceMode.Description="Không rõ, thử nghiệm"
+AMF.H264.MaximumSliceSize.Description="Không rõ, thử nghiệm"
+AMF.H264.SliceControlMode.Description="Không rõ, thử nghiệm"
+AMF.H264.SliceControlSize.Description="Không rõ, thử nghiệm"
+AMF.H264.IntraRefresh.NumberOfStripes.Description="Không rõ, thử nghiệm"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/zh-CN.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/zh-CN.ini Changed

@@ -1,90 +1,135 @@
-AMF.Util.Default="默认"
-AMF.Util.Automatic="自动"
-AMF.Util.Manual="手动"
-AMF.Util.Toggle.Disabled="禁用"
-AMF.Util.Toggle.Enabled="启用"
-AMF.H264.Preset="预设"
-AMF.H264.Preset.ResetToDefaults="重置为默认值"
-AMF.H264.Preset.Recording="录像"
-AMF.H264.Preset.HighQuality="高质量"
-AMF.H264.Preset.Indistinguishable="无法区分"
-AMF.H264.Preset.Lossless="无损"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="使用"
-AMF.H264.Usage.Description="AMF 应调整为什么用法:\n-'转码' 是通用转码(推荐), \n '超低延迟' 对于真的低延迟编码,\n-'低延迟' 类似于上面稍高的延迟.\n 推流仅支持 '转码', 所有其他值可以用于录制."
-AMF.H264.Usage.Transcoding="转码"
-AMF.H264.Usage.UltraLowLatency="超低延迟"
-AMF.H264.Usage.LowLatency="低延迟"
-AMF.H264.QualityPreset="质量预设"
-AMF.H264.QualityPreset.Description="哪种质量预设 AMF 应该尝试对于目标:\n-'速度' 是最快但有最差的质量,\n-'平衡' 是 '速度' 和 '质量' 之间, 提供一个两者之间的较好的平衡,\n-'质量' 给出了最好的质量对于给定的比特率."
-AMF.H264.QualityPreset.Speed="速度"
-AMF.H264.QualityPreset.Balanced="平衡"
-AMF.H264.QualityPreset.Quality="质量"
-AMF.H264.Profile="配置文件"
-AMF.H264.Profile.Description="H.264的编码选项有：\n-'Baseline' 支持的平台最广，\n-'Main' 支持较老的设备（如果使用的平台是手机，推荐使用），\n-'High' 被当下的设备支持（推荐使用）。"
-AMF.H264.ProfileLevel="配置等级"
-AMF.H264.ProfileLevel.Description="对于编码使用哪种 H.264 Profile Level:\n-'Automatic' 根据给定的帧率和帧大小计算最优的 profile level,\n-'4.1' 支持 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n-'4.2' 支持 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n-'5.0' 支持 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n-'5.1' 支持 3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n-'5.2' 支持 3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="速率控制方法"
-AMF.H264.RateControlMethod.Description="该使用什么调节码率的方法：\n- '\@AMF.H264.RateControlMethod.CQP\@' assigns fixed I-/P-/B-Frame QP (Quantization Parameter) values,\n- '\@AMF.H264.RateControlMethod.CBR\@' stays at the given Target Bitrate (using Filler Data) (推荐推流使用),\n- '\@AMF.H264.RateControlMethod.VBR\@' stays below the given Peak Bitrate,\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' stays close to the Target Bitrate if GPU latency and load allow for it, otherwise will use higher bitrate (推荐录像使用)."
-AMF.H264.RateControlMethod.CQP="恒定 QP (CQP)"
-AMF.H264.RateControlMethod.CBR="固定比特率 (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="变比特率 (峰值约束) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="变比特率 (延迟约束) (VBR_LAT)"
-AMF.H264.Bitrate.Target="目标比特率"
-AMF.H264.Bitrate.Target.Description="尝试在这个序列中获取的比特率."
-AMF.H264.Bitrate.Peak="峰值比特率"
-AMF.H264.Bitrate.Peak.Description="尝试在这个序列中获取的峰值比特率."
-AMF.H264.QP.Minimum="最低 QP"
-AMF.H264.QP.Minimum.Description="一帧中最低 QP (量化参数) 值"
-AMF.H264.QP.Maximum="最高 QP"
-AMF.H264.QP.Maximum.Description="一帧中最高 QP (量化参数) 值"
-AMF.H264.QP.IFrame="I 帧 QP"
-AMF.H264.QP.IFrame.Description="用于 I 帧的固定的 QP 值."
-AMF.H264.QP.PFrame="P 帧 QP"
-AMF.H264.QP.PFrame.Description="用于 P 帧的固定 QP 值."
-AMF.H264.QP.BFrame="B 帧 QP"
-AMF.H264.QP.BFrame.Description="用于 B 帧的固定 QP (量化参数) 值."
-AMF.H264.VBVBuffer="VBV 缓存"
-AMF.H264.VBVBuffer.Description="应使用什么方法来确定 VBV 缓冲区大小:\n-'自动' 计算使用严格约束的大小,\n- '手册' 允许用户控制大小.\nVBV缓存 (视频缓冲程序验证程序) 用于某些率控制方法来保持整体的比特率在给定的约束内."
-AMF.H264.VBVBuffer.Strictness="VBV 缓存规范性"
-AMF.H264.VBVBuffer.Strictness.Description="决定 VBV 缓存的严格性, 100% 表示尽可能严格, 0% 表示无限制."
-AMF.H264.VBVBuffer.Size="VBV 缓存大小"
-AMF.H264.VBVBuffer.Size.Description="用于在一个序列中的控制比特率的 VBV 缓存的大小."
-AMF.H264.VBVBuffer.Fullness="VBV 缓冲满"
-AMF.H264.VBVBuffer.Fullness.Description="VBV 缓存最初应该多满, 将只会影响最初的序列的编码."
-AMF.H264.FillerData="填充数据"
-AMF.H264.FillerData.Description="启用填充数据允许编码器至少保持目标比特率, 通过填满空信息序列中的剩余空间."
-AMF.H264.FrameSkipping="跳过的帧"
-AMF.H264.FrameSkipping.Description="跳过的帧允许编码器下丢帧, 以满足目标比特率要求.\n当编码器丢帧时, 它反而插入一个重复最后一帧的 NAL 到流中.\n可以帮助非常低的目标比特率."
-AMF.H264.EnforceHRDCompatibility="强制 HRD 兼容"
-AMF.H264.EnforceHRDCompatibility.Description="强制假设的参考解码器限制在一个帧内的最大的 QP 值更改.\n不推荐用于录制或推流, 并且应仅用于面向只有参考软件解码器的很老的设备."
-AMF.H264.KeyframeInterval="关键帧间隔"
-AMF.H264.KeyframeInterval.Description="非丢弃帧之间应该多少秒.\n也控制序列(GOP) 的大小."
-AMF.H264.IDRPeriod="IDR 周期"
-AMF.H264.IDRPeriod.Description="定义的帧内瞬时解码刷新 (IDR) 的距离. 也控制 GOP 序列长度."
-AMF.H264.BFrame.Pattern="B 帧"
-AMF.H264.BFrame.Pattern.Description="多少 B 帧应该用于编码.\n2 代和 3 代 VCE 卡支持. 对编码性能有负面影响."
-AMF.H264.BFrame.DeltaQP="B 帧差值 QP"
-AMF.H264.BFrame.DeltaQP.Description="对于非参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
-AMF.H264.BFrame.Reference="参考 B 帧"
-AMF.H264.BFrame.Reference.Description="允许 B 帧也使用 B 帧作为参考, 而不是只是 P 和 I 帧."
-AMF.H264.BFrame.ReferenceDeltaQP="参考 B 帧差值 QP"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="对于参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
-AMF.H264.DeblockingFilter="去块滤波"
-AMF.H264.DeblockingFilter.Description="设置解码器允许使用的标记, 用于编码流去块滤波器."
-AMF.H264.ScanType="扫描类型"
-AMF.H264.ScanType.Description="使用哪种扫描方法, 通常设置为'Progressive'."
-AMF.H264.ScanType.Progressive="渐进"
-AMF.H264.ScanType.Interlaced="交错"
-AMF.H264.MotionEstimation="移动侦测"
-AMF.H264.MotionEstimation.Description="运动侦测允许编码器通过估计一个像素去了哪里来降低比特率."
-AMF.H264.MotionEstimation.None="无"
-AMF.H264.MotionEstimation.Half="半像素"
-AMF.H264.MotionEstimation.Quarter="四分之一像素"
-AMF.H264.MotionEstimation.Both="半&四分之一像素"
-AMF.H264.CodingType="编码类型"
-AMF.H264.CodingType.Description="使用哪种编码类型:\n* \@AMF.Util.Default\@ 让 AMF 决定(推荐).\n* CALVC(上下文自适应可变长度编码) 速度更快但是更大.\n* CABAC(上下文自适应二进制算术编码)速度更慢, 但是更小."
+Utility.Default="默认"
+Utility.Automatic="自动"
+Utility.Manual="手动"
+Utility.Switch.Disabled="禁用"
+Utility.Switch.Enabled="启用"
+Preset="预设"
+Preset.ResetToDefaults="重置为默认值"
+Preset.Recording="录像"
+Preset.HighQuality="高质量"
+Preset.Indistinguishable="无法区分"
+Preset.Lossless="无损"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="使用"
+Usage.Description="AMF 应调整为什么用法:\n-'\@Usage.Transcoding\@' 是通用转码(推荐),\n- '\@Usage.UltraLowLatency\@' 用于真正低延迟编码,\n-'\@Usage.LowLatency\@' 类似于上面稍高的延迟.\n 推流仅支持 '\@Usage.Transcoding\@', 所有其他值可以用于录制."
+Usage.Transcoding="转码"
+Usage.UltraLowLatency="超低延迟"
+Usage.LowLatency="低延迟"
+Usage.Webcam="网络摄像头"
+QualityPreset="质量预设"
+QualityPreset.Description="质量预设 AMF 应尝试向目标:\n-'\@QualityPreset.Speed\@' 是最快但最差的质量,\n-'\@QualityPreset.Balanced\@' 是平衡两者的混合,\n-'\@QualityPreset.Quality\@' 给出了最好的质量为给定的比特率."
+QualityPreset.Speed="速度"
+QualityPreset.Balanced="平衡"
+QualityPreset.Quality="质量"
+Profile="配置文件"
+Profile.Description="什么配置文件进行编码. 从最佳支持(顶部) 到最好的质量(底部) 排序."
+ProfileLevel="配置等级"
+ProfileLevel.Description="要使用哪些配置文件级别. 最好设置在 \@Utility.Automatic\@."
+Tier="层"
+Tier.Description="要在编码在哪一层. '高' 目标高的比特率/带宽使用, 而 '主' 针对主流媒体."
+AspectRatio="长宽比"
+AspectRatio.Description="哪个长宽比应写入输出文件."
+CodingType="编码类型"
+CodingType.Description="使用哪种编码类型:\n* '\@Utility.Automatic\@' 让 AMF 决定(推荐).\n* 'CALVC'(上下文自适应可变长度编码) 速度更快但是更大.\n* 'CABAC'(上下文自适应二进制算术编码)速度更慢, 但是更小."
+MaximumReferenceFrames="最大参考帧"
+MaximumReferenceFrames.Description="在大多数编码时多少帧编码器可能会引用, 对编码质量有直接影响."
+RateControlMethod="速率控制方法"
+RateControlMethod.Description="应该使用什么比率控制方法:\n- '\@RateControlMethod.CQP\@' 赋值固定的 I/P/B 帧 QP(量化参数) 值,\n- '\@RateControlMethod.CBR\@' 保持在一个给定的目标比特率(使用过滤数据)(推荐用于推流),\n- '\@RateControlMethod.VBR\@' 保持在给定的峰值比特率以下,\n- '\@RateControlMethod.VBRLAT\@' 保持接近目标比特率如果 GPU 延迟和负载, 否则将会使用更高的比特率(推荐用于录制)."
+RateControlMethod.CQP="恒定 QP (CQP)"
+RateControlMethod.CBR="固定比特率 (CBR)"
+RateControlMethod.VBR="变比特率 (峰值约束) (VBR)"
+RateControlMethod.VBRLAT="变比特率 (延迟约束) (VBR_LAT)"
+PrePassMode="前通模式"
+PrePassMode.Description="前通是次选的比特率发行通过, 允许更好发行在一个序列内的比特率, 然而效果可能会随着不同的卡而不同."
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ (四分之一大小)"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ (半尺寸)"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ (全尺寸)"
+Bitrate.Target="目标比特率"
+Bitrate.Target.Description="尝试在整个序列中获取的比特率."
+Bitrate.Peak="峰值比特率"
+Bitrate.Peak.Description="尝试在整个序列中最大获取的比特率."
+QP.IFrame="I 帧 QP"
+QP.IFrame.Description="用于 I 帧的固定的 QP 值."
+QP.PFrame="P 帧 QP"
+QP.PFrame.Description="用于 P 帧的固定 QP 值."
+QP.BFrame="B 帧 QP"
+QP.BFrame.Description="用于 B 帧的固定的 QP 值."
+QP.Minimum="最低 QP"
+QP.Minimum.Description="在一个 I 帧中使用的最低 QP 值."
+QP.IFrame.Minimum="最小 I-帧 QP"
+QP.IFrame.Minimum.Description="在一个 I 帧中使用的最低 QP 值."
+QP.PFrame.Minimum="最小 I-帧 QP"
+QP.PFrame.Minimum.Description="在一个 P 帧中使用的最低 QP 值."
+QP.Maximum="最高 QP"
+QP.Maximum.Description="在一个帧中使用的最高 QP 值."
+QP.IFrame.Maximum="最大 I-帧 QP"
+QP.IFrame.Maximum.Description="在一个 I 帧中使用的最高 QP 值."
+QP.PFrame.Maximum="最大的 P 帧 QP"
+QP.PFrame.Maximum.Description="在一个 P 帧中使用的最高 QP 值."
+FillerData="填充数据"
+FillerData.Description="启用填充数据允许编码器至少保持 \@Bitrate.Target\@, 通过填满空信息序列中的剩余空间."
+FrameSkipping="跳过的帧"
+FrameSkipping.Description="跳过的帧允许编码器下丢帧, 以满足\@Bitrate.Target\@ 要求.\n当编码器丢帧时, 它反而插入一个重复最后一帧的 NAL 到流中.\n可以帮助非常低的\@Bitrate.Target\@."
+VBAQ="VBAQ"
+VBAQ.Description="启用'基于方差的自适应量化'(VBAQ), 基于像素的方差来更好地区分比特率.\n他基于原理人类的视觉系统是对高纹理的物体不敏感, 因而将推动比特率来实现更平滑的界面.\n启用这个可能会导致某些内容的主观质量的改善."
+EnforceHRD="强制 HRD"
+EnforceHRD.Description="强制使用假设的参考解码器, 用于验证输出码流是否正确."
+VBVBuffer="VBV 缓存"
+VBVBuffer.Description="应使用什么方法来确定 VBV 缓冲区大小:\n-'\@Utlity.Automatic\@' 计算使用严格约束的大小,\n- '\@Utlity.Manual\@' 允许用户控制大小.\nVBV缓存 (视频缓冲程序验证程序) 用于某些率控制方法来保持整体的比特率在给定的约束内."
+VBVBuffer.Strictness="VBV 缓存规范性"
+VBVBuffer.Strictness.Description="决定 VBV 缓存的严格性, 100% 表示尽可能严格, 0% 表示无限制."
+VBVBuffer.Size="VBV 缓存大小"
+VBVBuffer.Size.Description="用于在一个序列中的控制比特率的 VBV 缓存的大小."
+VBVBuffer.InitialFullness="VBV 缓冲区初始满"
+VBVBuffer.InitialFullness.Description="VBV 缓存最初应该多满(百分比), 将只会影响最初的序列的编码."
+KeyframeInterval="关键帧间隔"
+KeyframeInterval.Description="关键帧之间间隔(以秒为单位)."
+H264.IDRPeriod="IDR 周期 (帧)"
+H264.IDRPeriod.Description="定义帧内瞬时解码刷新 (IDR) 的距离. 也控制 GOP 序列长度."
+H265.IDRPeriod="IDR 周期 (GOPs)"
+H265.IDRPeriod.Description="定义 GOP 之间瞬时解码刷新 (IDR) 的距离。"
+GOP.Type="GOP 类型"
+GOP.Type.Description="应使用哪种类型的 GOP:\n-'\@GOP.Type.Fixed\@' 将始终使用固定的每个 GOP 之间的距离之.\n-'\@GOP.Type.Variable\@' 允许 GOPs 为不同值, 取决于什么是需要的.\n'\@GOP.Type.Fixed\@' 是 H264 实现如何工作和最好的本地网络推流, 而 '\@GOP.Type.Variable\@' 是最适合低大小高品质的录像."
+GOP.Type.Fixed="固定的"
+GOP.Type.Variable="可变的"
+GOP.Size="GOP 大小"
+GOP.Size.Description="帧中最大的 GOP (Group Of Pictures) 大小"
+GOP.Size.Minimum="GOP 大小最小值"
+GOP.Size.Minimum.Description="帧中最小的 GOP (Group Of Pictures) 大小"
+GOP.Size.Maximum="GOP 大小最大值"
+GOP.Size.Maximum.Description="帧中最大的 GOP (Group Of Pictures) 大小"
+GOP.Alignment="GOP 对齐"
+GOP.Alignment.Description="实验, 效果是未知. 使用风险由自己负责."
+BFrame.Pattern="B 帧模式"
+BFrame.Pattern.Description="在编码时使用多少 B 帧.\n2 代和 3 代 VCE 卡支持. 对编码性能有负面影响."
+BFrame.DeltaQP="B 帧差值 QP"
+BFrame.DeltaQP.Description="对于非参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
+BFrame.Reference="B 帧参考"
+BFrame.Reference.Description="允许 B 帧也使用 B 帧作为参考, 而不是只是 P 和 I 帧."
+BFrame.ReferenceDeltaQP="B 帧参考差值 QP"
+BFrame.ReferenceDeltaQP.Description="对于参考 B 帧, 相对于上一个 I 或者 P 帧的差值 QP 值."
+DeblockingFilter="去块滤波"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Resources/locale/zh-TW.ini -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Resources/locale/zh-TW.ini Changed

@@ -1,90 +1,102 @@
-AMF.Util.Default="預設"
-AMF.Util.Automatic="自動"
-AMF.Util.Manual="手動"
-AMF.Util.Toggle.Disabled="停用"
-AMF.Util.Toggle.Enabled="啟用"
-AMF.H264.Preset="預設"
-AMF.H264.Preset.ResetToDefaults="重設為預設值"
-AMF.H264.Preset.Recording="錄影"
-AMF.H264.Preset.HighQuality="高品質"
-AMF.H264.Preset.Indistinguishable="無法區分"
-AMF.H264.Preset.Lossless="無損"
-AMF.H264.Preset.Twitch="Twitch"
-AMF.H264.Preset.YouTube="YouTube"
-AMF.H264.Usage="用法"
-AMF.H264.Usage.Description="根據用途 AMF 應調整為︰ \n- '\@AMF.H264.Usage.Transcoding\@' 是通用轉碼 （推薦），\n- '\@AMF.H264.Usage.UltraLowLatency\@' 是為了真的非常低延遲的編碼，\n- '\@AMF.H264.Usage.LowLatency\@'是類似於上面但延遲稍高。 \n串流僅支援'\@AMF.H264.Usage.Transcoding\@'，其他值可以用於錄影。"
-AMF.H264.Usage.Transcoding="轉碼"
-AMF.H264.Usage.UltraLowLatency="超低延遲"
-AMF.H264.Usage.LowLatency="低延遲"
-AMF.H264.QualityPreset="預設品質"
-AMF.H264.QualityPreset.Description="AMF 嘗試達成的預設品質：\n- '\@AMF.H264.QualityPreset.Speed\@' 為最快但最差的品質，\n- '\@AMF.H264.QualityPreset.Balanced\@' 為中間點，\n- '\@AMF.H264.QualityPreset.Quality\@' 在給定的位元速率下有最佳的品質。"
-AMF.H264.QualityPreset.Speed="速度"
-AMF.H264.QualityPreset.Balanced="平衡"
-AMF.H264.QualityPreset.Quality="品質"
-AMF.H264.Profile="設定檔"
-AMF.H264.Profile.Description="用於編碼的 H.264 設定：\n- 'Baseline' 有最廣泛的平台支援度，\n- 'Main' 較舊的裝置也支援 (如果目標是行動裝置，建議選此)，\n- 'High' 當前主流裝置支援 (建議選此)。"
-AMF.H264.ProfileLevel="設定檔級別"
-AMF.H264.ProfileLevel.Description="用於編碼的 H.264 設定等級：\n- '\@AMF.Util.Automatic\@'根據給定的畫面播放速率以及尺寸計算最佳的設定等級,\n- '4.1'支援 1920x1080 30FPS, 1280x720 60FPS, 960x540 90FPS\n- '4.2'支援 1920x1080 60FPS, 1280x720 120FPS, 960x540 172FPS\n- '5.0'支援 1920x1080 60FPS, 1280x720 144FPS, 960x540 172FPS\n- '5.1'支援3840x2160 30FPS, 1920x1080 120FPS, 1280x720 172FPS, 960x540 172FPS\n- '5.2'支援3840x2160 60FPS, 1920x1080 172FPS, 1280x720 172FPS, 960x540 172FPS"
-AMF.H264.RateControlMethod="速率控制方法"
-AMF.H264.RateControlMethod.Description="該使用什麼位元速率控制方法：\n- '\@AMF.H264.RateControlMethod.CQP\@' 指定固定的 I-/P-/B-訊框 QP (量化參數)值，\n- '\@AMF.H264.RateControlMethod.CBR\@' 固定在給定的目標位元速率 (藉由填塞空白資料)(建議用於串流)，\n- '\@AMF.H264.RateControlMethod.VBR\@' 保持低於給定的位元速率最大值，\n- '\@AMF.H264.RateControlMethod.VBR_LAT\@' 在 GPU 延遲跟負載允許的情況下盡量接近目標位元速率，不足時使用較高的位元速率(建議用於錄影)。"
-AMF.H264.RateControlMethod.CQP="固定 QP (CQP)"
-AMF.H264.RateControlMethod.CBR="固定位元率 (CBR)"
-AMF.H264.RateControlMethod.VBR.Peak="可變位元率 (限制最大位元率) (VBR)"
-AMF.H264.RateControlMethod.VBR.Latency="可變位元率 (限制延遲) (VBR)"
-AMF.H264.Bitrate.Target="目標位元率"
-AMF.H264.Bitrate.Target.Description="在整體過程中嘗試達成的位元速率。"
-AMF.H264.Bitrate.Peak="最大位元率"
-AMF.H264.Bitrate.Peak.Description="在整體過程中嘗試不超過的位元速率。"
-AMF.H264.QP.Minimum="最低 QP 值"
-AMF.H264.QP.Minimum.Description="一個訊框中使用的最低 QP （量化參數） 值。"
-AMF.H264.QP.Maximum="最大 QP 值"
-AMF.H264.QP.Maximum.Description="一個訊框中使用的最高 QP （量化參數） 值。"
-AMF.H264.QP.IFrame="I-訊框 QP"
-AMF.H264.QP.IFrame.Description="I 訊框所使用的固定 QP 值"
-AMF.H264.QP.PFrame="P-訊框 QP"
-AMF.H264.QP.PFrame.Description="P 訊框所使用的固定 QP 值"
-AMF.H264.QP.BFrame="B-訊框 QP"
-AMF.H264.QP.BFrame.Description="B-訊框使用的固定 QP (量化參數) 值。"
-AMF.H264.VBVBuffer="VBV(Video Buffering Verifier) 緩衝區"
-AMF.H264.VBVBuffer.Description="決定 VBV 緩衝區大小的方法：\n- '\@AMF.Util.Automatic\@' 根據嚴格性計算大小，\n- '\@AMF.Util.Manual\@' 允許使用者調整大小。\n 某些速率控制方法會使用 VBV (Video Buffering Verifier) 緩衝區讓整體的位元速率保持在給定的條件之內。"
-AMF.H264.VBVBuffer.Strictness="VBV 緩衝區嚴格性"
-AMF.H264.VBVBuffer.Strictness.Description="決定 VBV 緩衝區的嚴密性，100% 表示盡可能的嚴格，0% 表示完全不限制。"
-AMF.H264.VBVBuffer.Size="VBV 緩衝區大小"
-AMF.H264.VBVBuffer.Size.Description="VBV緩衝區的大小，這將用於過程中的位元速率控制"
-AMF.H264.VBVBuffer.Fullness="初始 VBV 緩衝區填充度"
-AMF.H264.VBVBuffer.Fullness.Description="VBV 緩衝區起始該多滿，將只影響編碼的起始。"
-AMF.H264.FillerData="填塞空白資料"
-AMF.H264.FillerData.Description="啟用填塞空白資料允許編碼器保持位元速率至少有目標位元速率，編碼器將會將不足的位元用空白訊息填滿"
-AMF.H264.FrameSkipping="省略訊框"
-AMF.H264.FrameSkipping.Description="省略訊框允許編碼器在為了達成目標位元速率時省略部份訊框。\n當編碼器省略訊框時，他將插入重複上一個訊框的指令。\n對極低的目標位元速率有幫助。"
-AMF.H264.EnforceHRDCompatibility="與 HRD 相容"
-AMF.H264.EnforceHRDCompatibility.Description="執行 Hypothetical Reference Decoder 限制，這將限制單一訊框內 QP 值的最大變化量。"
-AMF.H264.KeyframeInterval="關鍵訊框間隔"
-AMF.H264.KeyframeInterval.Description="以秒為單位，定義關鍵訊框之間的距離。同時也控制了 GOP 序列的大小。"
-AMF.H264.IDRPeriod="IDR 周期"
-AMF.H264.IDRPeriod.Description="以訊框為單位，定義瞬間解碼重新更新（Instantaneous Decoding Refreshes）間的距離。同時也控制了 GOP 序列的大小。"
-AMF.H264.BFrame.Pattern="B 訊框"
-AMF.H264.BFrame.Pattern.Description="編碼時使用的 B 訊框數量。\n搭載第二代和第三代影像編碼引擎的顯示卡支援此參數。對編碼效能會有不良影響。"
-AMF.H264.BFrame.DeltaQP="B 訊框的 QP 值變化"
-AMF.H264.BFrame.DeltaQP.Description="在沒使用可參照 B 訊框時， B 訊框與上一個I或P訊框間的QP值變化。"
-AMF.H264.BFrame.Reference="可參照 B 訊框"
-AMF.H264.BFrame.Reference.Description="允許 B 訊框也使用 B 訊框作為參照，而不限於 P 和 I 訊框。"
-AMF.H264.BFrame.ReferenceDeltaQP="可參照 B 訊框的 QP 值變化"
-AMF.H264.BFrame.ReferenceDeltaQP.Description="在使用可參照 B 訊框時，B 訊框與上一個 I 或 P 訊框間的 QP 值變化。"
-AMF.H264.DeblockingFilter="去塊狀色斑濾鏡"
-AMF.H264.DeblockingFilter.Description="設定選項，讓解碼器可以使用去塊狀色斑濾鏡。"
-AMF.H264.ScanType="掃描類型"
-AMF.H264.ScanType.Description="掃描方式，請確保此值為'\@AMF.H264.ScanType.Progressive\@'。"
-AMF.H264.ScanType.Progressive="漸進式"
-AMF.H264.ScanType.Interlaced="交错式"
-AMF.H264.MotionEstimation="動態估算"
-AMF.H264.MotionEstimation.Description="動態估算讓編碼器藉由估算像素移動來減少位元速率。"
-AMF.H264.MotionEstimation.None="無"
-AMF.H264.MotionEstimation.Half="半像素"
-AMF.H264.MotionEstimation.Quarter="四分之一像素"
-AMF.H264.MotionEstimation.Both="半 & 四分之一像素"
-AMF.H264.CodingType="Coding Type"
-AMF.H264.CodingType.Description="Which type of coding to use:\n* \@AMF.Util.Default\@ lets AMF decide (recommended).\n* CALVC (Context-Adaptive Variable-Length Coding) is faster, but larger.\n* CABAC (Context-Adaptive Binary Arithmetic Coding) is slower, but smaller."
+Utility.Default="預設"
+Utility.Automatic="自動"
+Utility.Manual="自訂"
+Utility.Switch.Disabled="已停用"
+Utility.Switch.Enabled="已啟用"
+Preset="預設"
+Preset.ResetToDefaults="重設為預設值"
+Preset.Recording="錄影"
+Preset.HighQuality="高畫質"
+Preset.Indistinguishable="無法區分"
+Preset.Lossless="無損"
+Preset.Twitch="Twitch"
+Preset.YouTube="YouTube"
+Usage="使用情況"
+Usage.Description="根據用途 AMF 應調整為︰ \n- '\@Usage.Transcoding\@' 是通用轉碼 （推薦），\n- '\@Usage.UltraLowLatency\@' 是為了真的非常低延遲的編碼，\n- '\@Usage.LowLatency\@'是類似於上面但延遲稍高。 \n串流僅支援'\@Usage.Transcoding\@'，其他值可以用於錄影。"
+Usage.Transcoding="轉碼"
+Usage.UltraLowLatency="超低延遲"
+Usage.LowLatency="低延遲"
+Usage.Webcam="網路攝影機"
+QualityPreset="品質預設"
+QualityPreset.Description="AMF 嘗試達成的預設品質：\n- '\@QualityPreset.Speed\@' 為最快但最差的品質，\n- '\@QualityPreset.Balanced\@' 為中間點，\n- '\@QualityPreset.Quality\@' 在給定的位元速率下有最佳的品質。"
+QualityPreset.Speed="速度"
+QualityPreset.Balanced="平衡"
+QualityPreset.Quality="品質"
+Profile="設定"
+Profile.Description="使用哪種設定進行編碼。從最廣泛被支援（頂部）到最好的畫質（底部）排序。"
+ProfileLevel="設定級別"
+ProfileLevel.Description="使用哪種設定級別。建議保持設定為\@Utility.Automatic\@。"
+Tier="Tier"
+Tier.Description="對哪種 Tier 編碼。'High' 針對高位元率/頻寬的情境，'Main' 針對主流媒介。"
+AspectRatio="長寬比"
+AspectRatio.Description="寫進輸出檔案的長寬比"
+CodingType="編碼類型"
+CodingType.Description="使用哪種類型的編碼︰ \n* '\@Utility.Automatic\@' 讓 AMF 決定 （推薦）。 \n* 'CALVC' （上下文自我調整可變長度編碼） 較快，但產出較大的檔案。 \n* 'CABAC' （上下文自我調整二進位算術編碼） 較慢，但較小。"
+MaximumReferenceFrames="最大參考訊框"
+MaximumReferenceFrames.Description="編碼器在編碼時最多可參照的訊框數，直接影響編碼品質。"
+RateControlMethod="速率控制方法"
+RateControlMethod.Description="該使用什麼位元速率控制方法：\n- '\@RateControlMethod.CQP\@' 指定固定的 I-/P-/B-訊框 QP (量化參數)值，\n- '\@RateControlMethod.CBR\@' 固定在給定的目標位元速率 (藉由填塞空白資料)(建議用於串流)，\n- '\@RateControlMethod.VBR\@' 保持低於給定的位元速率最大值，\n- '\@RateControlMethod.VBRLAT\@' 在 GPU 延遲跟負載允許的情況下盡量接近目標位元速率，不足時使用較高的位元速率(建議用於錄影)。"
+RateControlMethod.CQP="恒定 QP (CQP)"
+RateControlMethod.CBR="固定位元率 (CBR)"
+RateControlMethod.VBR="可變位元率 (限制最大位元率) (VBR)"
+RateControlMethod.VBRLAT="可變位元率 (限制延遲) (VBR)"
+PrePassMode="前置階段模式"
+PrePassMode.Description="前置階段是次要的位元率分配階段，此階段讓過程內的位元率能有更好的分配，然而這個效果對每個顯示卡都有所不同。"
+PrePassMode.Quarter="\@Utility.Switch.Enabled\@ （四分之一大小）"
+PrePassMode.Half="\@Utility.Switch.Enabled\@ （半尺寸）"
+PrePassMode.Full="\@Utility.Switch.Enabled\@ （全尺寸）"
+Bitrate.Target="目標位元率"
+Bitrate.Target.Description="在整體過程中嘗試達成的位元速率。"
+Bitrate.Peak="最大位元率"
+Bitrate.Peak.Description="在整體過程中嘗試不超過的位元速率。"
+QP.IFrame="I-訊框 QP"
+QP.IFrame.Description="I 訊框所使用的固定 QP 值"
+QP.PFrame="P-訊框 QP"
+QP.PFrame.Description="P 訊框所使用的固定 QP 值"
+QP.BFrame="B-訊框 QP"
+QP.BFrame.Description="B 訊框所使用的固定 QP 值"
+QP.Minimum="最低 QP 值"
+QP.Minimum.Description="在一個訊框中使用的最低 QP 值。"
+QP.IFrame.Minimum="最低 I-訊框 QP"
+QP.IFrame.Minimum.Description="在一個 I-訊框中使用的最低 QP 值。"
+QP.PFrame.Minimum="最低 P-訊框 QP"
+QP.PFrame.Minimum.Description="在一個 P-訊框中使用的最低 QP 值。"
+QP.Maximum="最大 QP 值"
+QP.Maximum.Description="在一個訊框中使用的最高 QP 值。"
+QP.IFrame.Maximum="最大 I-訊框 QP"
+QP.IFrame.Maximum.Description="在一個 I-訊框中使用的最高 QP 值。"
+QP.PFrame.Maximum="最大 P-訊框 QP"
+QP.PFrame.Maximum.Description="在一個 P-訊框中使用的最高 QP 值。"
+FillerData="填塞空白資料"
+FillerData.Description="啟用填塞空白資料允許編碼器保持位元速率至少有\@Bitrate.Target\@，編碼器將會將不足的位元用空白訊息填滿"
+FrameSkipping="省略訊框"
+FrameSkipping.Description="省略訊框允許編碼器在為了達成\@Bitrate.Target\@時省略部份訊框。\n當編碼器省略訊框時，他將插入重複上一個訊框的指令。\n對極低的\@Bitrate.Target\@有幫助。"
+VBAQ="VBAQ"
+EnforceHRD="強制使用 HRD"
+EnforceHRD.Description="強制使用 Hypothetical Reference Decoder，HRD 用於驗證輸出位元流是否正確。"
+VBVBuffer="VBV(Video Buffering Verifier) 緩衝區"
+VBVBuffer.Description="決定 VBV 緩衝區大小的方法：\n- '\@Utility.Automatic\@' 根據嚴格性計算大小，\n- '\@Utility.Manual\@' 允許使用者調整大小。\n 某些速率控制方法會使用 VBV (Video Buffering Verifier) 緩衝區讓整體的位元速率保持在給定的條件之內。"
+DeblockingFilter="去塊狀色斑濾鏡"
+DeblockingFilter.Description="允許解碼器使用去塊狀色斑濾鏡。"
+MotionEstimation="動態估算"
+MotionEstimation.Description="動態估算讓編碼器藉由估算像素移動來減少位元速率。"
+MotionEstimation.Quarter="四分之一像素"
+MotionEstimation.Half="半像素"
+MotionEstimation.Full="四分之一與半像素"
+Video.API="影像 API"
+Video.API.Description="後端應使用什麼 API？"
+Video.Adapter="顯示卡"
+Video.Adapter.Description="該嘗試用那個顯示卡編碼？"
+OpenCL="OpenCL"
+OpenCL.Description="使用 OpenCL 提交訊框？技術上更快，但 （由於不相容的 OpenCL 函式庫） 會跟 Intel 驅動程式相衝。"
+View="檢視模式"
+View.Description="該顯示哪些屬性？\n使用'\@View.Master\@'時將不提供任何的支援。"
+View.Basic="基本"
+View.Advanced="進階"
+View.Expert="專家"
+View.Master="上帝模式"
+Debug="除錯模式"
+Debug.Description="啟用額外的除錯訊息。需要用 '--verbose --log_unfiltered' 命令列來啟動 OBS"
 AMF.H264.MaximumLTRFrames="Maximum LTR Frames"
 AMF.H264.MaximumLTRFrames.Description="Long Term Reference (LTR) Frames are a feature that allows the encoder to flag certain frames in a sequence as referencable for a long time.\nLTR Frames can't be used with B-Frames and the encoder will disable B-Frames if these are used."
 AMF.H264.MaximumAccessUnitSize="Maximum Access Unit Size"
@@ -93,16 +105,6 @@
 AMF.H264.HeaderInsertionSpacing.Description="How many frames should be between NAL headers."
 AMF.H264.WaitForTask="Wait For Task"
 AMF.H264.WaitForTask.Description="Unknown, Experimental"
-AMF.H264.PreAnalysisPass="預分析階段"
-AMF.H264.PreAnalysisPass.Description="Unknown, Experimental"
-AMF.H264.VBAQ="VBAQ"
-AMF.H264.VBAQ.Description="Unknown, Experimental"
-AMF.H264.GOPSize="GOP Size"
-AMF.H264.GOPSize.Description="Unknown, Experimental"

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/amf-capabilities.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/amf-capabilities.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,374 +22,94 @@
 SOFTWARE.
 */
 
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include <string>
-#include <sstream>
-
-#ifdef _WIN32
-#include <windows.h>
-#include <VersionHelpers.h>
-#endif
-
 #include "amf-capabilities.h"
-#include "api-d3d11.h"
-#include "api-d3d9.h"
-#include "misc-util.cpp"
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
-
-Plugin::AMD::VCEDeviceCapabilities::VCEDeviceCapabilities() {
-	acceleration_type = amf::AMF_ACCEL_NOT_SUPPORTED;
-	maxProfile =
-		maxProfileLevel =
-		maxBitrate =
-		minReferenceFrames =
-		maxReferenceFrames =
-		maxTemporalLayers =
-		maxNumOfStreams =
-		maxNumOfHwInstances =
-		input.minWidth =
-		input.maxWidth =
-		input.minHeight =
-		input.maxHeight =
-		input.verticalAlignment =
-		output.minWidth =
-		output.maxWidth =
-		output.minHeight =
-		output.maxHeight =
-		output.verticalAlignment = 0;
-	supportsBFrames =
-		supportsFixedSliceMode =
-		input.supportsInterlaced =
-		output.supportsInterlaced = false;
-	input.formats.clear();
-	input.memoryTypes.clear();
-	output.formats.clear();
-	output.memoryTypes.clear();
+#include "utility.h"
+
+//#ifdef _WIN32
+//#include <windows.h>
+//#include <VersionHelpers.h>
+//#endif
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+
+#pragma region Singleton
+static CapabilityManager* __instance;
+static std::mutex __instance_mutex;
+void Plugin::AMD::CapabilityManager::Initialize() {
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	if (!__instance)
+		__instance = new CapabilityManager();
 }
 
-std::shared_ptr<Plugin::AMD::VCECapabilities> Plugin::AMD::VCECapabilities::GetInstance() {
-	static std::shared_ptr<VCECapabilities> __instance = std::make_shared<VCECapabilities>();
-	static std::mutex __mutex;
-
-	const std::lock_guard<std::mutex> lock(__mutex);
+CapabilityManager* Plugin::AMD::CapabilityManager::Instance() {
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
 	return __instance;
 }
 
-void Plugin::AMD::VCECapabilities::ReportCapabilities(std::shared_ptr<Plugin::API::Base> api) {
-	auto inst = GetInstance();
-	auto adapters = api->EnumerateAdapters();
-	for (auto adapter : adapters) {
-		ReportAdapterCapabilities(api, adapter);
-	}
-}
-
-void Plugin::AMD::VCECapabilities::ReportAdapterCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter) {
-	auto inst = GetInstance();
-	H264EncoderType types[] = {
-		H264EncoderType::AVC,
-		H264EncoderType::SVC,
-	};
-
-	AMF_LOG_INFO("Capabilities for %s adapter '%s':",
-		api->GetName().c_str(),
-		adapter.Name.c_str());
-
-	for (auto type : types) {
-		ReportAdapterTypeCapabilities(api, adapter, type);
-	}
-}
-
-void Plugin::AMD::VCECapabilities::ReportAdapterTypeCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, H264EncoderType type) {
-	auto inst = GetInstance();
-	auto caps = inst->GetAdapterCapabilities(api, adapter, type);
-
-	AMF_LOG_INFO("  %s (Acceleration: %s)",
-		(type == H264EncoderType::AVC ? "AVC" : (type == H264EncoderType::SVC ? "SVC" : "Unknown")),
-		(caps.acceleration_type == amf::AMF_ACCEL_SOFTWARE ? "Software" : (caps.acceleration_type == amf::AMF_ACCEL_GPU ? "GPU" : (caps.acceleration_type == amf::AMF_ACCEL_HARDWARE ? "Hardware" : "None")))
-	);
-
-	if (caps.acceleration_type == amf::AMF_ACCEL_NOT_SUPPORTED)
-		return;
-
-	AMF_LOG_INFO("    Limits");
-	AMF_LOG_INFO("      Profile: %s", Plugin::Utility::ProfileAsString((H264Profile)caps.maxProfile));
-	AMF_LOG_INFO("      Profile Level: %ld.%ld", caps.maxProfileLevel / 10, caps.maxProfileLevel % 10);
-	AMF_LOG_INFO("      Bitrate: %ld", caps.maxBitrate);
-	AMF_LOG_INFO("      Reference Frames: %ld (min) - %ld (max)", caps.minReferenceFrames, caps.maxReferenceFrames);
-	if (type == H264EncoderType::SVC)
-		AMF_LOG_INFO("      Temporal Layers: %ld", caps.maxTemporalLayers);
-	AMF_LOG_INFO("    Features");
-	AMF_LOG_INFO("      B-Frames: %s", caps.supportsBFrames ? "Supported" : "Not Supported");
-	AMF_LOG_INFO("      Fixed Slice Mode: %s", caps.supportsFixedSliceMode ? "Supported" : "Not Supported");
-	AMF_LOG_INFO("    Instancing");
-	AMF_LOG_INFO("      # of Streams: %ld", caps.maxNumOfStreams);
-	AMF_LOG_INFO("      # of Instances: %ld", caps.maxNumOfHwInstances);
-	AMF_LOG_INFO("    Input");
-	ReportAdapterTypeIOCapabilities(api, adapter, type, false);
-	AMF_LOG_INFO("    Output");
-	ReportAdapterTypeIOCapabilities(api, adapter, type, true);
-}
-
-void Plugin::AMD::VCECapabilities::ReportAdapterTypeIOCapabilities(std::shared_ptr<Plugin::API::Base> api, Plugin::API::Adapter adapter, H264EncoderType type, bool output) {
-	auto amf = Plugin::AMD::AMF::GetInstance();
-
-	auto inst = GetInstance();
-	VCEDeviceCapabilities::IOCaps ioCaps = output
-		? inst->GetAdapterCapabilities(api, adapter, type).output
-		: inst->GetAdapterCapabilities(api, adapter, type).input;
-	AMF_LOG_INFO("      Resolution: %ldx%ld - %ldx%ld",
-		ioCaps.minWidth, ioCaps.minHeight,
-		ioCaps.maxWidth, ioCaps.maxHeight);
-	AMF_LOG_INFO("      Vertical Alignment: %ld", ioCaps.verticalAlignment);
-	AMF_LOG_INFO("      Interlaced: %s", ioCaps.supportsInterlaced ? "Supported" : "Not Supported");
-	std::stringstream formatstr;
-	for (auto format : ioCaps.formats) {
-		std::vector<char> buf(1024);
-		wcstombs(buf.data(), amf->GetTrace()->SurfaceGetFormatName(format.first), 1024);
-		formatstr
-			<< buf.data()
-			<< (format.second ? " (Native)" : "")
-			<< ", ";
-	}
-	AMF_LOG_INFO("      Formats: %s", formatstr.str().c_str());
-	std::stringstream memorystr;
-	for (auto memory : ioCaps.memoryTypes) {
-		std::vector<char> buf(1024);
-		wcstombs(buf.data(), amf->GetTrace()->GetMemoryTypeName(memory.first), 1024);
-		memorystr
-			<< buf.data()
-			<< (memory.second ? " (Native)" : "")
-			<< ", ";
-	}
-	AMF_LOG_INFO("      Memory Types: %s", memorystr.str().c_str());
-}
-
-Plugin::AMD::VCECapabilities::VCECapabilities() {
-	this->Refresh();
-}
-
-Plugin::AMD::VCECapabilities::~VCECapabilities() {}
-
-static AMF_RESULT GetIOCapability(bool output, amf::AMFCapsPtr amfCaps, Plugin::AMD::VCEDeviceCapabilities::IOCaps* caps) {
-	AMF_RESULT res = AMF_OK;
-	amf::AMFIOCapsPtr amfIOCaps;
-	if (output)
-		res = amfCaps->GetOutputCaps(&amfIOCaps);
-	else
-		res = amfCaps->GetInputCaps(&amfIOCaps);
-	if (res != AMF_OK)
-		return res;
-
-	amfIOCaps->GetWidthRange(&(caps->minWidth), &(caps->maxWidth));
-	amfIOCaps->GetHeightRange(&(caps->minHeight), &(caps->maxHeight));
-	caps->supportsInterlaced = amfIOCaps->IsInterlacedSupported();

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/amf-encoder-h264.cpp Added

@@ -0,0 +1,1847 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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.
+*/
+
+#include "amf-encoder-h264.h"
+#include "utility.h"
+#include <inttypes.h>
+
+#define QUICK_THROW_ERROR(format, ...) {\
+	QUICK_FORMAT_MESSAGE(errMsg, __FUNCTION_NAME__ format, \
+		m_UniqueId,  ##__VA_ARGS__, \
+		m_AMF->GetTrace()->GetResultText(res), res); \
+	throw std::exception(errMsg.c_str()); \
+}
+
+#define PREFIX "[H264]<Id: %lld> "
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+using namespace Utility;
+
+Plugin::AMD::EncoderH264::EncoderH264(
+	std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+	bool useOpenCLSubmission, bool useOpenCLConversion,
+	ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
+	bool useAsyncQueue, size_t asyncQueueSize)
+	: Encoder(Codec::AVC,
+		videoAPI, videoAdapter,
+		useOpenCLSubmission, useOpenCLConversion,
+		colorFormat, colorSpace, fullRangeColor,
+		useAsyncQueue, asyncQueueSize) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = AMF_UNEXPECTED;
+
+	/// Full Range Color Stuff
+	static const wchar_t* fullColorParams[] = {
+		L"FullRangeColor",
+		L"NominalRange",
+	};
+	for (const wchar_t* par : fullColorParams) {
+		res = m_AMFConverter->SetProperty(par, m_FullColorRange);
+		res = m_AMFEncoder->SetProperty(par, m_FullColorRange);
+		if (res == AMF_OK)
+			break;
+	}
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+			PREFIX "Failed to set encoder color range, error %ls (code %d)",
+			m_UniqueId,
+			m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::EncoderH264::~EncoderH264() {
+	AMFTRACECALL;
+}
+
+// Properties - Initialization
+std::vector<Usage> Plugin::AMD::EncoderH264::CapsUsage() {
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_USAGE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<Usage> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::UsageFromAMFH264((AMF_VIDEO_ENCODER_USAGE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetUsage(Usage v) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_USAGE, Utility::UsageToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+			m_UniqueId, Utility::UsageToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::Usage Plugin::AMD::EncoderH264::GetUsage() {
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_USAGE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::UsageFromAMFH264((AMF_VIDEO_ENCODER_USAGE_ENUM)e);
+}
+
+// Properties - Static
+std::vector<QualityPreset> Plugin::AMD::EncoderH264::CapsQualityPreset() {
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_QUALITY_PRESET, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<QualityPreset> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::QualityPresetFromAMFH264((AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetQualityPreset(QualityPreset v) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET,
+		Utility::QualityPresetToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+			m_UniqueId, Utility::QualityPresetToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::QualityPreset Plugin::AMD::EncoderH264::GetQualityPreset() {
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_QUALITY_PRESET, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::QualityPresetFromAMFH264((AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM)e);
+}
+
+std::vector<Profile> Plugin::AMD::EncoderH264::CapsProfile() {
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_PROFILE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<Profile> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::ProfileFromAMFH264((AMF_VIDEO_ENCODER_PROFILE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH264::SetProfile(Profile v) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_PROFILE,
+		Utility::ProfileToAMFH264(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, PREFIX "<" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+			m_UniqueId, Utility::ProfileToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::Profile Plugin::AMD::EncoderH264::GetProfile() {

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/amf-encoder-h265.cpp Added

@@ -0,0 +1,1884 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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.
+*/
+
+#include "amf-encoder-h265.h"
+#include "utility.h"
+#include <inttypes.h>
+
+#define QUICK_THROW_ERROR(format, ...) {\
+	QUICK_FORMAT_MESSAGE(errMsg, __FUNCTION_NAME__ format, \
+		m_UniqueId,  ##__VA_ARGS__, \
+		m_AMF->GetTrace()->GetResultText(res), res); \
+	throw std::exception(errMsg.c_str()); \
+}
+#define PREFIX "[H265]<Id: %lld> "
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+using namespace Utility;
+
+Plugin::AMD::EncoderH265::EncoderH265(
+	std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+	bool useOpenCLSubmission, bool useOpenCLConversion,
+	ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
+	bool useAsyncQueue, size_t asyncQueueSize)
+	: Encoder(Codec::HEVC,
+		videoAPI, videoAdapter,
+		useOpenCLSubmission, useOpenCLConversion,
+		colorFormat, colorSpace, fullRangeColor,
+		useAsyncQueue, asyncQueueSize) {
+	AMFTRACECALL;
+}
+
+
+Plugin::AMD::EncoderH265::~EncoderH265() {
+	AMFTRACECALL;
+}
+
+// Initialization
+std::vector<Usage> Plugin::AMD::EncoderH265::CapsUsage() {
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_USAGE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<Usage> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::UsageFromAMFH265((AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetUsage(Usage v) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_USAGE, Utility::UsageToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+			m_UniqueId, Utility::UsageToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::Usage Plugin::AMD::EncoderH265::GetUsage() {
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_USAGE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::UsageFromAMFH265((AMF_VIDEO_ENCODER_HEVC_USAGE_ENUM)e);
+}
+
+// Static
+std::vector<QualityPreset> Plugin::AMD::EncoderH265::CapsQualityPreset() {
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	std::vector<QualityPreset> ret;
+	for (const amf::AMFEnumDescriptionEntry* enm = var->pEnumDescription; enm->name != nullptr; enm++) {
+		ret.push_back(Utility::QualityPresetFromAMFH265((AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM)enm->value));
+	}
+	return ret;
+}
+
+void Plugin::AMD::EncoderH265::SetQualityPreset(QualityPreset v) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, Utility::QualityPresetToAMFH265(v));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %s, error %ls (code %d)",
+			m_UniqueId, Utility::QualityPresetToString(v), m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+}
+
+Plugin::AMD::QualityPreset Plugin::AMD::EncoderH265::GetQualityPreset() {
+	AMFTRACECALL;
+
+	int64_t e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	return Utility::QualityPresetFromAMFH265((AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM)e);
+}
+
+std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>> Plugin::AMD::EncoderH265::CapsResolution() {
+	AMFTRACECALL;
+
+	const amf::AMFPropertyInfo* var;
+	AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &var);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Querying capabilities failed, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	return std::make_pair(
+		std::make_pair(var->minValue.sizeValue.width, var->maxValue.sizeValue.width),
+		std::make_pair(var->minValue.sizeValue.height, var->maxValue.sizeValue.height)
+	);
+}
+
+void Plugin::AMD::EncoderH265::SetResolution(std::pair<uint32_t, uint32_t> v) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, ::AMFConstructSize(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ldx%ld, error %ls (code %d)",
+			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_Resolution.first = v.first;
+	m_Resolution.second = v.second;
+}
+
+std::pair<uint32_t, uint32_t> Plugin::AMD::EncoderH265::GetResolution() {
+	AMFTRACECALL;
+
+	AMFSize e;
+
+	AMF_RESULT res = m_AMFEncoder->GetProperty(AMF_VIDEO_ENCODER_HEVC_FRAMESIZE, &e);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to retrieve value, error %ls (code %d)",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	m_Resolution.first = e.width;
+	m_Resolution.second = e.height;
+	return std::make_pair(e.width, e.height);
+}
+
+void Plugin::AMD::EncoderH265::SetAspectRatio(std::pair<uint32_t, uint32_t> v) {
+	AMFTRACECALL;
+
+	AMF_RESULT res = m_AMFEncoder->SetProperty(AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ::AMFConstructRatio(v.first, v.second));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg, "<Id: %lld> <" __FUNCTION_NAME__ "> Failed to set to %ld:%ld, error %ls (code %d)",
+			m_UniqueId, v.first, v.second, m_AMF->GetTrace()->GetResultText(res), res);

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/amf-encoder.cpp Added

@@ -0,0 +1,1076 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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.
+*/
+
+#include "amf-encoder.h"
+#include "utility.h"
+#include "components/VideoConverter.h"
+#ifdef WITH_AVC
+#include "components/VideoEncoderVCE.h"
+#endif
+#ifdef WITH_HEVC
+#include "components/VideoEncoderHEVC.h"
+#endif
+#include <thread>
+#include "libobs/util/threading.h"
+
+using namespace Plugin;
+using namespace Plugin::AMD;
+
+Plugin::AMD::Encoder::Encoder(Codec codec,
+	std::shared_ptr<API::IAPI> videoAPI, API::Adapter videoAdapter,
+	bool useOpenCLSubmission, bool useOpenCLConversion,
+	ColorFormat colorFormat, ColorSpace colorSpace, bool fullRangeColor,
+	bool useAsyncQueue, size_t asyncQueueSize) {
+	#pragma region Null Values
+	m_UniqueId = Utility::GetUniqueIdentifier();
+	/// AMF Internals
+	m_AMF = nullptr;
+	m_AMFFactory = nullptr;
+	m_AMFContext = nullptr;
+	m_AMFEncoder = nullptr;
+	m_AMFConverter = nullptr;
+	m_AMFMemoryType = amf::AMF_MEMORY_UNKNOWN;
+	m_AMFSurfaceFormat = Utility::ColorFormatToAMF(colorFormat);
+	/// API Related
+	m_API = nullptr;
+	m_APIDevice = nullptr;
+	m_OpenCLSubmission = false;
+	/// Properties
+	m_Codec = codec;
+	m_ColorFormat = colorFormat;
+	m_ColorSpace = colorSpace;
+	m_FullColorRange = fullRangeColor;
+	m_Resolution = std::make_pair<uint32_t, uint32_t>(0, 0);
+	m_FrameRate = std::make_pair<uint32_t, uint32_t>(0, 0);
+	m_TimestampStep = 0;
+	m_TimestampStepRounded = 0;
+	m_TimestampOffset = 0;
+	/// Flags
+	m_Initialized = true;
+	m_Started = false;
+	m_OpenCL = false;
+	m_OpenCLSubmission = useOpenCLSubmission;
+	m_OpenCLConversion = useOpenCLConversion;
+	m_HaveFirstFrame = false;
+	m_AsyncQueue = useAsyncQueue;
+	m_AsyncQueueSize = asyncQueueSize;
+	#pragma endregion Null Values
+
+	// Initialize selected API on Video Adapter
+	m_API = videoAPI;
+	m_APIAdapter = videoAdapter;
+	m_APIDevice = m_API->CreateInstance(m_APIAdapter);
+
+	// Initialize Advanced Media Framework
+	m_AMF = AMF::Instance();
+	/// Retrieve Factory
+	m_AMFFactory = m_AMF->GetFactory();
+
+	// Create Context for Conversion and Encoding
+	AMF_RESULT res = m_AMFFactory->CreateContext(&m_AMFContext);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+			"<Id: %lld> Creating a AMF Context failed, error %ls (code %d).",
+			m_UniqueId, m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	/// Initialize Context using selected API
+	switch (m_API->GetType()) {
+		case API::Type::Direct3D11:
+		case API::Type::Direct3D9:
+			break;
+		default:
+			m_API = API::GetAPI(0);
+			switch (m_API->GetType()) {
+				case API::Type::Direct3D9:
+					m_APIAdapter = m_API->EnumerateAdapters()[0];
+					m_APIDevice = m_API->CreateInstance(m_APIAdapter);
+					break;
+				case API::Type::Direct3D11:
+					m_APIAdapter = m_API->EnumerateAdapters()[0];
+					m_APIDevice = m_API->CreateInstance(m_APIAdapter);
+					break;
+			}
+	}
+	switch (m_API->GetType()) {
+		case API::Type::Direct3D9:
+			m_AMFMemoryType = amf::AMF_MEMORY_DX9;
+			res = m_AMFContext->InitDX9(m_APIDevice->GetContext());
+			break;
+		case API::Type::Direct3D11:
+			m_AMFMemoryType = amf::AMF_MEMORY_DX11;
+			res = m_AMFContext->InitDX11(m_APIDevice->GetContext());
+			break;
+	}
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+			"<Id: %lld> Initializing %s API with Adapter '%s' failed, error %ls (code %d).",
+			m_UniqueId,
+			m_API->GetName().c_str(), m_APIAdapter.Name.c_str(),
+			m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	// Initialize OpenCL (if possible)
+	if (m_OpenCLSubmission || m_OpenCLConversion) {
+		res = m_AMFContext->InitOpenCL();
+		if (res == AMF_OK) {
+			m_OpenCL = true;
+
+			res = m_AMFContext->GetCompute(amf::AMF_MEMORY_OPENCL, &m_AMFCompute);
+			if (res != AMF_OK) {
+				m_OpenCLSubmission = false;
+				m_OpenCLConversion = false;
+
+				QUICK_FORMAT_MESSAGE(errMsg,
+					"<Id: %lld> Retrieving Compute object failed, error %ls (code %d)",
+					m_UniqueId,
+					m_AMF->GetTrace()->GetResultText(res), res);
+				PLOG_WARNING("%s", errMsg.data());
+			}
+		} else {
+			m_OpenCL = false;
+			m_OpenCLSubmission = false;
+			m_OpenCLConversion = false;
+
+			QUICK_FORMAT_MESSAGE(errMsg,
+				"<Id: %lld> Initialising OpenCL failed, error %ls (code %d)",
+				m_UniqueId,
+				m_AMF->GetTrace()->GetResultText(res), res);
+			PLOG_WARNING("%s", errMsg.data());
+		}
+	}
+
+	// Create Converter
+	res = m_AMFFactory->CreateComponent(m_AMFContext, AMFVideoConverter, &m_AMFConverter);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+			"<Id: %lld> Creating frame converter component failed, error %ls (code %d)",
+			m_UniqueId,
+			m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_MEMORY_TYPE, amf::AMF_MEMORY_UNKNOWN);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+			"<Id: %lld> Unable to set converter memory type, error %ls (code %d)",
+			m_UniqueId,
+			m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_OUTPUT_FORMAT, amf::AMF_SURFACE_NV12);
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+			"<Id: %lld> Unable to set converter output format, error %ls (code %d)",
+			m_UniqueId,
+			m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+	res = m_AMFConverter->SetProperty(AMF_VIDEO_CONVERTER_COLOR_PROFILE, Utility::ColorSpaceToAMFConverter(m_ColorSpace));
+	if (res != AMF_OK) {
+		QUICK_FORMAT_MESSAGE(errMsg,
+			"<Id: %lld> Unable to set convertor color profile, error %ls (code %d)",
+			m_UniqueId,
+			m_AMF->GetTrace()->GetResultText(res), res);
+		throw std::exception(errMsg.c_str());
+	}
+
+	// Create Encoder

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/amf.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/amf.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -44,36 +44,47 @@
 class CustomWriter : public amf::AMFTraceWriter {
 	public:
 
-	virtual void Write(const wchar_t* scope, const wchar_t* message) override {
+	virtual void __cdecl Write(const wchar_t* scope, const wchar_t* message) override {
 		const wchar_t* realmsg = &(message[(33 + wcslen(scope) + 2)]); // Skip Time & Scope
-		int msgLen = (int)wcslen(realmsg) - (sizeof(wchar_t));
+		size_t msgLen = wcslen(realmsg) - (sizeof(wchar_t));
 
-		blog(LOG_INFO, "[AMF Encoder] [%.*ls][%ls] %.*ls",
+		blog(LOG_DEBUG, "[AMF Runtime] [%.*ls][%ls] %.*ls",
 			12, &(message[11]),
 			scope,
 			msgLen, realmsg);
 	}
 
-	virtual void Flush() override {}
+	virtual void __cdecl Flush() override {}
 };
 
-std::shared_ptr<Plugin::AMD::AMF> Plugin::AMD::AMF::GetInstance() {
-	static std::shared_ptr<AMF> __instance = std::make_shared<AMF>();
-	static std::mutex __mutex;
+#pragma region Singleton
+static AMF* __instance;
+static std::mutex __instance_mutex;
+void Plugin::AMD::AMF::Initialize() {
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	if (!__instance)
+		__instance = new AMF();
+}
 
-	const std::lock_guard<std::mutex> lock(__mutex);
+AMF* Plugin::AMD::AMF::Instance() {
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
 	return __instance;
 }
 
+void Plugin::AMD::AMF::Finalize() {
+	const std::lock_guard<std::mutex> lock(__instance_mutex);
+	if (__instance)
+		delete __instance;
+	__instance = nullptr;
+}
+#pragma endregion Singleton
+
 Plugin::AMD::AMF::AMF() {
 	AMF_RESULT res = AMF_OK;
 
-	// Initialize AMF Library
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
-
 	#pragma region Null Class Members
 	m_TimerPeriod = 0;
-	m_AMFVersion_Compiler = 0;
+	m_AMFVersion_Plugin = AMF_FULL_VERSION;
 	m_AMFVersion_Runtime = 0;
 	m_AMFModule = 0;
 
@@ -84,20 +95,31 @@
 	AMFInit = nullptr;
 	#pragma endregion Null Class Members
 
-	/// Load AMF Runtime into Memory.
+	#ifdef _WIN32
+	std::vector<char> verbuf;
+	void* pProductVersion = nullptr;
+	uint32_t lProductVersionSize = 0;
+	#endif
+
+	// Initialize AMF Library
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Initializing...");
+
+	// Load AMF Runtime Library
 	m_AMFModule = LoadLibraryW(AMF_DLL_NAME);
 	if (!m_AMFModule) {
-		DWORD error = GetLastError();
-		std::vector<char> buf(1024);
-		sprintf(buf.data(), "Unable to load '%ls', error code %ld.", AMF_DLL_NAME, error);
-		throw std::exception(buf.data());
+		QUICK_FORMAT_MESSAGE(msg, "Unable to load '%ls', error code %ld.",
+			AMF_DLL_NAME,
+			GetLastError());
+		throw std::exception(msg.data());
+	} else {
+		PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loaded '%ls'.", AMF_DLL_NAME);
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Loaded '%ls'.", AMF_DLL_NAME);
-	#ifdef _WIN32 // Windows: Get Product Version
-	void* pProductVersion = "unknown";
-	uint32_t lProductVersionSize = 7;
-	std::vector<char> verbuf(GetFileVersionInfoSizeW(AMF_DLL_NAME, nullptr));
-	if (GetFileVersionInfoW(AMF_DLL_NAME, 0, (DWORD)verbuf.size(), verbuf.data())) {
+
+	// Windows: Get Product Version for Driver Matching
+	#ifdef _WIN32 
+	{
+		verbuf.resize(GetFileVersionInfoSizeW(AMF_DLL_NAME, nullptr) * 2);
+		GetFileVersionInfoW(AMF_DLL_NAME, 0, (DWORD)verbuf.size(), verbuf.data());
 
 		void* pBlock = verbuf.data();
 
@@ -108,61 +130,67 @@
 		} *lpTranslate;
 		UINT cbTranslate = sizeof(LANGANDCODEPAGE);
 
-		if (VerQueryValueA(pBlock, "\\VarFileInfo\\Translation", (LPVOID*)&lpTranslate, &cbTranslate)) {
+		VerQueryValueA(pBlock, "\\VarFileInfo\\Translation", (LPVOID*)&lpTranslate, &cbTranslate);
 
-			std::vector<char> buf(1024);
-			sprintf(buf.data(), "%s%04x%04x%s",
-				"\\StringFileInfo\\",
-				lpTranslate[0].wLanguage,
-				lpTranslate[0].wCodePage,
-				"\\ProductVersion");
-
-			// Retrieve file description for language and code page "i". 
-			VerQueryValueA(pBlock, buf.data(), &pProductVersion, &lProductVersionSize);
-		}
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "%s%04x%04x%s",
+			"\\StringFileInfo\\",
+			lpTranslate[0].wLanguage,
+			lpTranslate[0].wCodePage,
+			"\\ProductVersion");
+
+		// Retrieve file description for language and code page "i". 
+		VerQueryValueA(pBlock, buf.data(), &pProductVersion, &lProductVersionSize);
 	}
-	#endif _WIN32 // Windows: Get Product Version
+	#endif _WIN32
 
-	/// Find Function for Querying AMF Version.
-	#pragma region Query AMF Runtime Version
+	// Query Runtime Version
 	AMFQueryVersion = (AMFQueryVersion_Fn)GetProcAddress(m_AMFModule, AMF_QUERY_VERSION_FUNCTION_NAME);
 	if (!AMFQueryVersion) {
-		DWORD error = GetLastError();
-		std::vector<char> buf(1024);
-		sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Finding Address of Function '%s' failed with error code %ld.", AMF_QUERY_VERSION_FUNCTION_NAME, error);
-		throw std::exception(buf.data());
+		QUICK_FORMAT_MESSAGE(msg, "Incompatible AMF Runtime (could not find '%s'), error code %ld.",
+			AMF_QUERY_VERSION_FUNCTION_NAME,
+			GetLastError());
+		throw std::exception(msg.data());
+	} else {
+		res = AMFQueryVersion(&m_AMFVersion_Runtime);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(msg, "Querying Version failed, error code %ld.",
+				res);
+			throw std::exception(msg.data());
+		}
 	}
-	/// Query Runtime Version
-	m_AMFVersion_Compiler = AMF_FULL_VERSION;
-	res = AMFQueryVersion(&m_AMFVersion_Runtime);
-	if (res != AMF_OK)
-		ThrowException("<" __FUNCTION_NAME__ "> Querying Version failed with error code %ld.", res);
-	#pragma endregion Query AMF Runtime Version
-
-		/// Find Function for Initializing AMF.
+
+	/// Initialize AMF
 	AMFInit = (AMFInit_Fn)GetProcAddress(m_AMFModule, AMF_INIT_FUNCTION_NAME);
 	if (!AMFInit) {
-		DWORD error = GetLastError();
-		std::vector<char> buf(1024);
-		sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Finding Address of Function '%s' failed with error code %ld.", AMF_INIT_FUNCTION_NAME, error);
-		throw std::exception(buf.data(), error);
+		QUICK_FORMAT_MESSAGE(msg, "Incompatible AMF Runtime (could not find '%s'), error code %ld.",
+			AMF_QUERY_VERSION_FUNCTION_NAME,
+			GetLastError());
+		throw std::exception(msg.data());
 	} else {
 		res = AMFInit(m_AMFVersion_Runtime, &m_AMFFactory);
-		if (res != AMF_OK)
-			ThrowException("<" __FUNCTION_NAME__ "> Initializing AMF Library failed with error code %ld.", res);
+		if (res != AMF_OK) {
+			QUICK_FORMAT_MESSAGE(msg, "Initializing AMF Library failed, error code %ld.",
+				res);
+			throw std::exception(msg.data());
+		}
 	}
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> AMF Library initialized.");
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> AMF Library initialized.");
 
 	/// Retrieve Trace Object.
 	res = m_AMFFactory->GetTrace(&m_AMFTrace);
 	if (res != AMF_OK) {
-		ThrowException("<" __FUNCTION_NAME__ "> Retrieving Trace object failed with error code %ld.", res);

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/api-base.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/api-base.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,7 @@
 */
 
 #pragma once
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-base.h"
-
 #include "api-d3d9.h"
 #include "api-d3d11.h"
 #include "api-host.h"
@@ -38,11 +34,10 @@
 #include <VersionHelpers.h>
 #endif
 
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 using namespace Plugin::API;
 
+
+// An Adapter on an API
 bool Plugin::API::operator<(const Plugin::API::Adapter & left, const Plugin::API::Adapter & right) {
 	if (left == right)
 		return left.Name < right.Name;
@@ -70,12 +65,35 @@
 	return !(left == right);
 }
 
-//////////////////////////////////////////////////////////////////////////
-// API Index
-//////////////////////////////////////////////////////////////////////////
-static std::vector<std::shared_ptr<Base>> s_APIInstances;
+// Instance of an API Adapter
+Plugin::API::Instance::Instance() {}
+
+Plugin::API::Instance::~Instance() {}
+
+// API Interface
+Plugin::API::IAPI::IAPI() {}
+
+Plugin::API::IAPI::~IAPI() {}
+
+Plugin::API::Adapter Plugin::API::IAPI::GetAdapterById(int32_t idLow, int32_t idHigh) {
+	for (auto adapter : EnumerateAdapters()) {
+		if ((adapter.idLow == idLow) && (adapter.idHigh == idHigh))
+			return adapter;
+	}
+	return *(EnumerateAdapters().begin());
+}
 
-void Plugin::API::Base::Initialize() {
+Plugin::API::Adapter Plugin::API::IAPI::GetAdapterByName(std::string name) {
+	for (auto adapter : EnumerateAdapters()) {
+		if (adapter.Name == name)
+			return adapter;
+	}
+	return *(EnumerateAdapters().begin());
+}
+
+// Static API Stuff
+static std::vector<std::shared_ptr<IAPI>> s_APIInstances;
+void Plugin::API::InitializeAPIs() {
 	// DirectX 11
 	#ifdef _WIN32
 	if (IsWindows8OrGreater()) {
@@ -90,44 +108,47 @@
 	}
 	#endif
 
-	// OpenGL
-	{
-		s_APIInstances.insert(s_APIInstances.end(), std::make_shared<OpenGL>());
-	}
+	// Mikhail says these are for compatibility only, not actually backends.
+	//// OpenGL
+	//{
+	//	s_APIInstances.insert(s_APIInstances.end(), std::make_shared<OpenGL>());
+	//}
 
-	// Host
-	{
-		s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Host>());
-	}
+	//// Host
+	//{
+	//	s_APIInstances.insert(s_APIInstances.end(), std::make_shared<Host>());
+	//}
+}
+
+void Plugin::API::FinalizeAPIs() {
+	s_APIInstances.clear();
 }
 
-size_t Plugin::API::Base::GetAPICount() {
+size_t Plugin::API::CountAPIs() {
 	return s_APIInstances.size();
 }
 
-std::shared_ptr<Base> Plugin::API::Base::GetAPIInstance(size_t index) {
+std::string Plugin::API::GetAPIName(size_t index) {
 	auto indAPI = s_APIInstances.begin();
-	for (size_t n = 0; n < index; n++)
-		indAPI++;
+	indAPI + index; // Advanced by x elements.
 
 	if (indAPI == s_APIInstances.end())
 		throw std::exception("Invalid API Index");
 
-	return *indAPI;
+	return indAPI->get()->GetName();
 }
 
-std::string Plugin::API::Base::GetAPIName(size_t index) {
+std::shared_ptr<IAPI> Plugin::API::GetAPI(size_t index) {
 	auto indAPI = s_APIInstances.begin();
 	indAPI + index; // Advanced by x elements.
 
 	if (indAPI == s_APIInstances.end())
 		throw std::exception("Invalid API Index");
 
-	return indAPI->get()->GetName();
+	return *indAPI;
 }
 
-
-std::shared_ptr<Base> Plugin::API::Base::GetAPIByName(std::string name) {
+std::shared_ptr<IAPI> Plugin::API::GetAPI(std::string name) {
 	for (auto api : s_APIInstances) {
 		if (name == api->GetName()) {
 			return api;
@@ -137,11 +158,21 @@
 	return *s_APIInstances.begin();
 }
 
-std::vector<std::shared_ptr<Base>> Plugin::API::Base::EnumerateAPIs() {
-	return std::vector<std::shared_ptr<Base>>(s_APIInstances);
+std::shared_ptr<IAPI> Plugin::API::GetAPI(Type type) {
+	for (auto api : s_APIInstances) {
+		if (type == api->GetType()) {
+			return api;
+		}
+	}
+	// If none was found, return the first one.
+	return *s_APIInstances.begin();
+}
+
+std::vector<std::shared_ptr<IAPI>> Plugin::API::EnumerateAPIs() {
+	return std::vector<std::shared_ptr<IAPI>>(s_APIInstances);
 }
 
-std::vector<std::string> Plugin::API::Base::EnumerateAPINames() {
+std::vector<std::string> Plugin::API::EnumerateAPINames() {
 	std::vector<std::string> names;
 	for (auto api : s_APIInstances) {
 		names.push_back(api->GetName());

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/api-d3d11.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/api-d3d11.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,24 +22,11 @@
 SOFTWARE.
 */
 
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-d3d11.h"
-
-#include <vector>
-#include <string>
 #include <sstream>
 #include <stdlib.h>
 #include <mutex>
 
-#include <dxgi.h>
-#include <d3d11.h>
-#include <atlutil.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 using namespace Plugin::API;
 
 class SingletonDXGI {
@@ -150,22 +137,16 @@
 	HMODULE hModule;
 };
 
-std::string Plugin::API::Direct3D11::GetName() {
-	return std::string("Direct3D 11");
-}
-
-std::vector<Adapter> Plugin::API::Direct3D11::EnumerateAdapters() {
+Plugin::API::Direct3D11::Direct3D11() {
 	auto dxgiInst = SingletonDXGI::GetInstance();
-
-	ATL::CComPtr<IDXGIFactory1> dxgiFactory;
-	HRESULT hr = dxgiInst->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&dxgiFactory);
+	HRESULT hr = dxgiInst->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&m_DXGIFactory);
 	if (FAILED(hr))
-		throw std::exception("<" __FUNCTION_NAME__ "> Failed to enumerate adapters, error code %X.", hr);
+		throw std::exception("<" __FUNCTION_NAME__ "> Unable to create DXGI, error code %X.", hr);
 
-	std::vector<Adapter> adapters;
+	// Enumerate Adapters
 	IDXGIAdapter1* dxgiAdapter = nullptr;
 	for (size_t adapterIndex = 0;
-		!FAILED(dxgiFactory->EnumAdapters1((UINT)adapterIndex, &dxgiAdapter));
+		!FAILED(m_DXGIFactory->EnumAdapters1((UINT)adapterIndex, &dxgiAdapter));
 		adapterIndex++) {
 		DXGI_ADAPTER_DESC1 desc = DXGI_ADAPTER_DESC1();
 		dxgiAdapter->GetDesc1(&desc);
@@ -173,60 +154,64 @@
 		if (desc.VendorId != 0x1002 /* AMD */)
 			continue;
 
-		std::vector<char> descBuf(256);
-		wcstombs(descBuf.data(), desc.Description, descBuf.size());
-		adapters.push_back(Adapter(
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "%ls (VEN_%04x/DEV_%04x/SUB_%04x/REV_%04x)",
+			desc.Description,
+			desc.VendorId,
+			desc.DeviceId,
+			desc.SubSysId,
+			desc.Revision);
+
+		m_AdapterList.emplace_back(
 			desc.AdapterLuid.LowPart,
 			desc.AdapterLuid.HighPart,
-			std::string(descBuf.data())
-		));
+			std::string(buf.data())
+		);
 	}
+}
 
-	return adapters;
+Plugin::API::Direct3D11::~Direct3D11() {
 }
 
-Plugin::API::Adapter Plugin::API::Direct3D11::GetAdapterById(uint32_t idLow, uint32_t idHigh) {
-	for (auto adapter : EnumerateAdapters()) {
-		if ((adapter.idLow == idLow) && (adapter.idHigh == idHigh))
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
+std::string Plugin::API::Direct3D11::GetName() {
+	return std::string("Direct3D 11");
 }
 
-Plugin::API::Adapter Plugin::API::Direct3D11::GetAdapterByName(std::string name) {
-	for (auto adapter : EnumerateAdapters()) {
-		if (adapter.Name == name)
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
+std::vector<Adapter> Plugin::API::Direct3D11::EnumerateAdapters() {
+	// We shouldn't expect HW to change during Runtime, at least not in a normal System.
+	return m_AdapterList;
 }
 
-struct Direct3D11Instance {
-	ATL::CComPtr<IDXGIFactory1> factory;
-	ATL::CComPtr<ID3D11Device> device;
-	ATL::CComPtr<ID3D11DeviceContext> context;
-};
+std::shared_ptr<Instance> Plugin::API::Direct3D11::CreateInstance(Adapter adapter) {
+	//std::lock_guard<std::mutex> lock(m_InstanceMapMutex);
+	//std::pair<int32_t, int32_t> key = std::make_pair(adapter.idLow, adapter.idHigh);
+	//auto inst = m_InstanceMap.find(key);
+	//if (inst != m_InstanceMap.end())
+	//	return inst->second;
 
-void* Plugin::API::Direct3D11::CreateInstanceOnAdapter(Adapter adapter) {
-	HRESULT hr;
+	auto inst2 = std::make_shared<Direct3D11Instance>(this, adapter);
+	//m_InstanceMap.insert_or_assign(key, inst2);
+	return inst2;
+}
 
-	auto dxgiInst = SingletonDXGI::GetInstance();
+Plugin::API::Type Plugin::API::Direct3D11::GetType() {
+	return Type::Direct3D11;
+}
 
-	ATL::CComPtr<IDXGIFactory1> dxgiFactory;
-	hr = dxgiInst->CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)&dxgiFactory);
-	if (FAILED(hr)) {
-		std::vector<char> buf(1024);
-		std::sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Failed to enumerate adapters, error code %X.", hr);
-		throw std::exception(buf.data());
-	}
+Plugin::API::Direct3D11Instance::Direct3D11Instance(Direct3D11* api, Adapter adapter) {
+	m_API = api;
+	m_Adapter = adapter;
+	m_Device = nullptr;
+	m_DeviceContext = nullptr;
 
 	LUID adapterLUID;
 	adapterLUID.LowPart = adapter.idLow;
 	adapterLUID.HighPart = adapter.idHigh;
 
+	HRESULT hr = E_FAIL;
 	ATL::CComPtr<IDXGIAdapter> dxgiAdapter;
 	for (size_t adapterIndex = 0;
-		!FAILED(dxgiFactory->EnumAdapters((UINT)adapterIndex, &dxgiAdapter));
+		!FAILED(api->m_DXGIFactory->EnumAdapters((UINT)adapterIndex, &dxgiAdapter));
 		adapterIndex++) {
 		DXGI_ADAPTER_DESC desc = DXGI_ADAPTER_DESC();
 		dxgiAdapter->GetDesc(&desc);
@@ -251,8 +236,6 @@
 		D3D_FEATURE_LEVEL_11_1,
 		D3D_FEATURE_LEVEL_11_0
 	};
-	ID3D11Device* d3dDevice;
-	ID3D11DeviceContext* d3dContext;
 	for (size_t c = 0; c < 3; c++) {
 		uint32_t flags = 0;
 
@@ -272,86 +255,35 @@
 			flags,
 			featureLevels + 1, _countof(featureLevels) - 1,
 			D3D11_SDK_VERSION,
-			&d3dDevice,
+			&m_Device,
 			NULL,
-			&d3dContext);
+			&m_DeviceContext);
 		if (SUCCEEDED(hr)) {
 			break;
 		} else {
-			AMF_LOG_WARNING("<" __FUNCTION_NAME__ "> Unable to create D3D11 device, error code %X (mode %Iu).", hr, c);
+			PLOG_WARNING("<" __FUNCTION_NAME__ "> Unable to create D3D11 device, error code %X (mode %d).", hr, c);
 		}
 	}
 	if (FAILED(hr)) {
 		std::vector<char> buf(1024);
-		std::sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Unable to create D3D11 device, error code %X.", hr);
-		throw std::exception(buf.data());
-	}
-
-	Direct3D11Instance* instance = new Direct3D11Instance();
-	instance->factory = dxgiFactory;
-	instance->device = d3dDevice;
-	instance->context = d3dContext;
-	return instance;
-}
-
-Plugin::API::Adapter Plugin::API::Direct3D11::GetAdapterForInstance(void* pInstance) {

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/api-d3d9.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/api-d3d9.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,48 +22,28 @@
 SOFTWARE.
 */
 
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-d3d9.h"
-
 #include <mutex>
 #include <list>
 
-#ifdef _DEBUG
-#define D3D_DEBUG_INFO
-#endif
-#pragma comment(lib, "d3d9.lib")
-#include <d3d9.h>
-#include <atlutil.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 using namespace Plugin::API;
 
-std::string Plugin::API::Direct3D9::GetName() {
-	return std::string("Direct3D 9");
-}
-
-std::vector<Adapter> Plugin::API::Direct3D9::EnumerateAdapters() {
-	ATL::CComPtr<IDirect3D9Ex> pD3DEx;
-	HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &pD3DEx);
+Plugin::API::Direct3D9::Direct3D9() {
+	HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &m_Direct3D9Ex);
 	if (FAILED(hr))
-		throw std::exception("<" __FUNCTION_NAME__ "> Failed to enumerate adapters, error code %X.", hr);
-
-	std::vector<Adapter> adapters;
+		throw std::exception("<" __FUNCTION_NAME__ "> Failed to create D3D9Ex, error code %X.", hr);
+	
 	std::list<LUID> enumeratedLUIDs;
 	D3DADAPTER_IDENTIFIER9 adapterIdentifier;
 	for (size_t adapterIndex = 0;
-		!FAILED(pD3DEx->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier));
+		!FAILED(m_Direct3D9Ex->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier));
 		adapterIndex++) {
 
 		if (adapterIdentifier.VendorId != 0x1002 /* AMD */)
 			continue;
 
 		LUID adapterLUID;
-		if (FAILED(pD3DEx->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
+		if (FAILED(m_Direct3D9Ex->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
 			continue;
 
 		bool enumerated = false;
@@ -79,66 +59,76 @@
 		else
 			enumeratedLUIDs.push_back(adapterLUID);
 
-		adapters.emplace_back(
+		std::vector<char> buf(1024);
+		snprintf(buf.data(), buf.size(), "%s [%s] (VEN_%04x/DEV_%04x/SUB_%04x/REV_%04x)",
+			adapterIdentifier.Description,
+			adapterIdentifier.DeviceName,
+			
+			adapterIdentifier.VendorId,
+			adapterIdentifier.DeviceId, 
+			adapterIdentifier.SubSysId, 
+			adapterIdentifier.Revision);
+
+		m_Adapters.emplace_back(
 			Adapter(adapterLUID.LowPart, adapterLUID.HighPart,
-				std::string(adapterIdentifier.Description)));
+				std::string(buf.data())));
 	}
+}
 
-	return adapters;
+Plugin::API::Direct3D9::~Direct3D9() {
+	//m_InstanceMap.clear(); // Need to destroy IDirect3D9Device9Ex before IDirect3D9Ex.
+	m_Direct3D9Ex->Release();
 }
 
-Plugin::API::Adapter Plugin::API::Direct3D9::GetAdapterById(uint32_t idLow, uint32_t idHigh) {
-	for (auto adapter : EnumerateAdapters()) {
-		if ((adapter.idLow == idLow) && (adapter.idHigh == idHigh))
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
+std::string Plugin::API::Direct3D9::GetName() {
+	return std::string("Direct3D 9");
 }
 
-Plugin::API::Adapter Plugin::API::Direct3D9::GetAdapterByName(std::string name) {
-	for (auto adapter : EnumerateAdapters()) {
-		if (adapter.Name == name)
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
+Plugin::API::Type Plugin::API::Direct3D9::GetType() {
+	return Type::Direct3D9;
+}
+
+std::vector<Adapter> Plugin::API::Direct3D9::EnumerateAdapters() {
+	return m_Adapters;
 }
 
-struct Direct3D9Instance {
-	ATL::CComPtr<IDirect3D9Ex> d3d;
-	ATL::CComPtr<IDirect3DDevice9Ex> device;
-};
+std::shared_ptr<Instance> Plugin::API::Direct3D9::CreateInstance(Adapter adapter) {
+	//std::pair<int32_t, int32_t> key = std::make_pair(adapter.idLow, adapter.idHigh);
+	//auto inst = m_InstanceMap.find(key);
+	//if (inst != m_InstanceMap.end())
+	//	return inst->second;
 
-void* Plugin::API::Direct3D9::CreateInstanceOnAdapter(Adapter adapter) {
-	ATL::CComPtr<IDirect3D9Ex> pD3DEx;
-	HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &pD3DEx);
-	if (FAILED(hr)) {
-		std::vector<char> buf(1024);
-		std::sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Unable to create Direct3D 9 instance, error code %X.", hr);
-		throw std::exception(buf.data());
-	}
+	auto inst2 = std::make_shared<Direct3D9Instance>(this, adapter);
+	//m_InstanceMap.insert_or_assign(key, inst2);
+	return inst2;
+}
+
+Plugin::API::Direct3D9Instance::Direct3D9Instance(Direct3D9* api, Adapter adapter) {
+	this->m_API = api;
+	this->m_Adapter = adapter;
 
 	size_t adapterNum = (size_t)-1;
 	D3DADAPTER_IDENTIFIER9 adapterIdentifier;
 	for (size_t adapterIndex = 0;
-		!FAILED(pD3DEx->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier));
+		!FAILED(api->m_Direct3D9Ex->GetAdapterIdentifier((UINT)adapterIndex, 0, &adapterIdentifier));
 		adapterIndex++) {
 
 		if (adapterIdentifier.VendorId != 0x1002 /* AMD */)
 			continue;
 
 		LUID adapterLUID;
-		if (FAILED(pD3DEx->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
+		if (FAILED(api->m_Direct3D9Ex->GetAdapterLUID((UINT)adapterIndex, &adapterLUID)))
 			continue;
 
-		if ((adapterLUID.LowPart == adapter.idLow)
-			&& (adapterLUID.HighPart == adapter.idHigh)) {
+		if ((static_cast<int32_t>(adapterLUID.LowPart) == adapter.idLow)
+			&& (static_cast<int32_t>(adapterLUID.HighPart) == adapter.idHigh)) {
 			adapterNum = adapterIndex;
 			break;
 		}
 	}
 	if (adapterNum == -1)
 		throw std::invalid_argument("adapter");
-
+	
 	D3DPRESENT_PARAMETERS presentParameters;
 	std::memset(&presentParameters, 0, sizeof(D3DPRESENT_PARAMETERS));
 	presentParameters.BackBufferWidth = 0;
@@ -152,10 +142,10 @@
 
 	D3DCAPS9    ddCaps;
 	std::memset(&ddCaps, 0, sizeof(ddCaps));
-	hr = pD3DEx->GetDeviceCaps((UINT)adapterNum, D3DDEVTYPE_HAL, &ddCaps);
+	HRESULT hr = api->m_Direct3D9Ex->GetDeviceCaps((UINT)adapterNum, D3DDEVTYPE_HAL, &ddCaps);
 	if (FAILED(hr)) {
 		std::vector<char> buf(1024);
-		std::sprintf(buf.data(), "<" __FUNCTION_NAME__ "> Unable to query capabilities for D3D9 adapter, error code %X.", hr);
+		snprintf(buf.data(), buf.size(), "<" __FUNCTION_NAME__ "> Unable to query capabilities for D3D9 adapter, error code %X.", hr);
 		throw std::exception(buf.data());
 	}
 
@@ -166,30 +156,31 @@
 		vp = D3DCREATE_SOFTWARE_VERTEXPROCESSING;
 	}
 
-	ATL::CComPtr<IDirect3DDevice9Ex> pD3DDeviceEx;
-	hr = pD3DEx->CreateDeviceEx(
+	hr = api->m_Direct3D9Ex->CreateDeviceEx(
 		(UINT)adapterNum,
 		D3DDEVTYPE_HAL,
 		presentParameters.hDeviceWindow,
 		vp | D3DCREATE_NOWINDOWCHANGES | D3DCREATE_MULTITHREADED,
 		&presentParameters,
 		NULL,
-		&pD3DDeviceEx

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/api-host.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/api-host.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,14 +22,8 @@
 SOFTWARE.
 */
 
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-host.h"
 
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 using namespace Plugin::API;
 
 std::string Plugin::API::Host::GetName() {
@@ -42,28 +36,18 @@
 
 std::vector<Adapter> Plugin::API::Host::EnumerateAdapters() {
 	std::vector<Adapter> list;
-	list.push_back(Adapter(0, 0, TEXT_T(AMF_UTIL_DEFAULT)));
+	list.push_back(Adapter(0, 0, "Default"));
 	return list;
 }
 
-Plugin::API::Adapter Plugin::API::Host::GetAdapterById(uint32_t idLow, uint32_t idHigh) {
-	return Adapter(0, 0, TEXT_T(AMF_UTIL_DEFAULT));
+std::shared_ptr<Instance> Plugin::API::Host::CreateInstance(Adapter adapter) {
+	return std::make_unique<HostInstance>();
 }
 
-Plugin::API::Adapter Plugin::API::Host::GetAdapterByName(std::string name) {
-	return Adapter(0, 0, TEXT_T(AMF_UTIL_DEFAULT));
+Plugin::API::Adapter Plugin::API::HostInstance::GetAdapter() {
+	return Adapter(0, 0, "Default");
 }
 
-void* Plugin::API::Host::CreateInstanceOnAdapter(Adapter adapter) {
+void* Plugin::API::HostInstance::GetContext() {
 	return nullptr;
 }
-
-Plugin::API::Adapter Plugin::API::Host::GetAdapterForInstance(void* pInstance) {
-	return Adapter(0, 0, TEXT_T(AMF_UTIL_DEFAULT));
-}
-
-void* Plugin::API::Host::GetContextFromInstance(void* pInstance) {
-	throw std::exception("Host API does not have a Context.");
-}
-
-void Plugin::API::Host::DestroyInstance(void* pInstance) {}

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/api-opengl.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/api-opengl.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,65 +22,52 @@
 SOFTWARE.
 */
 
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
 #include "api-opengl.h"
-
 #include <vector>
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#include <gl/GL.h>
-
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 using namespace Plugin::API;
 
+Plugin::API::OpenGL::OpenGL() {
+	// ToDo: Adapter enumeration needs to go by Display/Desktop.
+	// - Nvidia is the only one that has GPU Affinity extension.
+	// - Intel perhaps too since they used Nvidia technology. (Until recently at least)
+}
+
+Plugin::API::OpenGL::~OpenGL() {
+
+}
+
 std::string Plugin::API::OpenGL::GetName() {
 	return std::string("OpenGL");
 }
 
+Plugin::API::Type Plugin::API::OpenGL::GetType() {
+	return Type::OpenGL;
+}
+
 std::vector<Adapter> Plugin::API::OpenGL::EnumerateAdapters() {
 	std::vector<Adapter> adapters;
 	adapters.push_back(Adapter(0, 0, "Default"));
 	return adapters;
 }
 
-Plugin::API::Adapter Plugin::API::OpenGL::GetAdapterById(uint32_t idLow, uint32_t idHigh) {
-	for (auto adapter : EnumerateAdapters()) {
-		if ((adapter.idLow == idLow) && (adapter.idHigh == idHigh))
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
+std::shared_ptr<Instance> Plugin::API::OpenGL::CreateInstance(Adapter adapter) {
+	// ToDo: Actually create a hidden window and OpenGL context. Not that it is going to be useful.
+	return std::make_unique<OpenGLInstance>();
 }
 
-Plugin::API::Adapter Plugin::API::OpenGL::GetAdapterByName(std::string name) {
-	for (auto adapter : EnumerateAdapters()) {
-		if (adapter.Name == name)
-			return adapter;
-	}
-	return *(EnumerateAdapters().begin());
-}
+Plugin::API::OpenGLInstance::OpenGLInstance() {
 
-void* Plugin::API::OpenGL::CreateInstanceOnAdapter(Adapter adapter) {
-	return nullptr;
 }
 
-void Plugin::API::OpenGL::DestroyInstance(void* instance) {
-	return;
-}
+Plugin::API::OpenGLInstance::~OpenGLInstance() {
 
-Plugin::API::Adapter Plugin::API::OpenGL::GetAdapterForInstance(void* instance) {
-	return *(EnumerateAdapters().begin());
 }
 
-void* Plugin::API::OpenGL::GetContextFromInstance(void* instance) {
-	return nullptr;
+Plugin::API::Adapter Plugin::API::OpenGLInstance::GetAdapter() {
+	return Adapter(0, 0, "Default");
 }
 
-Plugin::API::Type Plugin::API::OpenGL::GetType() {
-	return Type::OpenGL;
+void* Plugin::API::OpenGLInstance::GetContext() {
+	return nullptr;
 }

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/enc-h264.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/enc-h264.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,57 +22,66 @@
 SOFTWARE.
 */
 
-#pragma once
-
 //////////////////////////////////////////////////////////////////////////
-// Includes
+// New UI Design
 //////////////////////////////////////////////////////////////////////////
-#include "enc-h264.h"
-#include "misc-util.cpp"
+// All: Preset
+// ----------- Static Section
+// Mas: Usage
+// All: Quality Preset
+// Adv: Profile
+// Adv: Profile Level
+// Mas: Aspect Ratio
+// Exp: Coding Type
+// Exp: Maximum Reference Frames
+// ----------- Rate Control Section
+// All: Rate Control Method
+// Adv: Pre-Pass Encoding (if supported)
+// All, CBR&VBR: Target Bitrate
+// All, VBR: Peak Bitrate
+// All, CQP: QP I/P/B
+// Adv, CBR&VBR: Min/Max QP
+// CBR: Filler Data
+// Adv: Frame Skipping
+// Exp: VBAQ
+// Exp: Enforce HRD 
+// ----------- VBV Buffer
+// Adv: VBV Buffer Size
+// Exp: VBV Buffer Initial Fullness
+// ----------- Picture Control
+// All: Keyframe Interval (Float)
+// Mas: IDR Period (Overrides Keyframe Interval if non-zero)
+// Adv: B-Frames (if supported)
+// Adv: B-Frame Delta QP (if supported, not CQP)
+// Adv: B-Frame Reference (if supported and B-Frames enabled)
+// Adv: B-Frame Reference Delta QP (if supported, not CQP)
+// Exp: Deblocking Filter
+// Exp: Motion Estimation (Dropdown)
+// ----------- Intra-Refresh
+// ToDo: Master Mode only?
+// ----------- System
+// Adv: API
+// Adv: Adapter
+// Exp: OpenCL
+// All: View
 
-#ifdef _WIN32
-#include <VersionHelpers.h>
+#include "enc-h264.h"
+#include "amf-encoder-h264.h"
+#include "amf-capabilities.h"
+#include "strings.h"
+#include "utility.h"
 
-#include "api-d3d9.h"
-#include "api-d3d11.h"
-#endif
+#define PREFIX "[H264/AVC]"
 
-//////////////////////////////////////////////////////////////////////////
-// Code
-//////////////////////////////////////////////////////////////////////////
 using namespace Plugin;
 using namespace Plugin::AMD;
 using namespace Plugin::Interface;
-
-enum class Presets : int8_t {
-	None = -1,
-	ResetToDefaults = 0,
-	Recording,
-	HighQuality,
-	Indistinguishable,
-	Lossless,
-	Twitch,
-	YouTube,
-};
-enum class ViewMode :uint8_t {
-	Basic,
-	Advanced,
-	Expert,
-	Master
-};
+using namespace Utility;
 
 void Plugin::Interface::H264Interface::encoder_register() {
-	// Ensure that there is a supported AMD GPU.
-	bool haveAVCsupport = false;
-	for (auto api : Plugin::API::Base::EnumerateAPIs()) {
-		for (auto adapter : api->EnumerateAdapters()) {
-			auto caps = VCECapabilities::GetInstance()->GetAdapterCapabilities(api, adapter, H264EncoderType::AVC);
-			if (caps.acceleration_type != amf::AMF_ACCEL_NOT_SUPPORTED)
-				haveAVCsupport = true;
-		}
-	}
-	if (!haveAVCsupport) {
-		AMF_LOG_WARNING("No detected GPU supports H264 encoding.");
+	// Test if we actually have AVC support.
+	if (!AMD::CapabilityManager::Instance()->IsCodecSupported(Codec::AVC)) {
+		PLOG_WARNING(PREFIX " Not supported by any GPU, disabling...");
 		return;
 	}
 
@@ -99,59 +108,34 @@
 	encoder_info->get_extra_data = &get_extra_data;
 
 	obs_register_encoder(encoder_info.get());
+	PLOG_DEBUG(PREFIX " Registered.");
 }
 
 const char* Plugin::Interface::H264Interface::get_name(void*) {
-	static const char* name = "H264 Encoder (AMD Advanced Media Framework)";
+	static const char* name = "H264/AVC Encoder (" PLUGIN_NAME ")";
 	return name;
 }
 
 void* Plugin::Interface::H264Interface::create(obs_data_t* settings, obs_encoder_t* encoder) {
-	Plugin::Interface::H264Interface* enc = nullptr;
 	try {
-		AMF_LOG_INFO("Starting up...");
-		enc = new Plugin::Interface::H264Interface(settings, encoder);
-		return enc;
+		return new Plugin::Interface::H264Interface(settings, encoder);
 	} catch (std::exception e) {
-		AMF_LOG_ERROR("%s", e.what());
-	} catch (std::exception* e) {
-		AMF_LOG_ERROR("%s", e->what());
-		delete e;
-	} catch (...) {
-		AMF_LOG_ERROR("Unknown Exception.");
+		PLOG_ERROR("%s", e.what());
 	}
-	if (enc)
-		delete enc;
-	return NULL;
+	return nullptr;
 }
 
 void Plugin::Interface::H264Interface::destroy(void* data) {
-	try {
-		AMF_LOG_INFO("Shutting down...");
-		Plugin::Interface::H264Interface* enc = static_cast<Plugin::Interface::H264Interface*>(data);
-		delete enc;
-	} catch (std::exception e) {
-		AMF_LOG_ERROR("%s", e.what());
-	} catch (std::exception* e) {
-		AMF_LOG_ERROR("%s", e->what());
-		delete e;
-	} catch (...) {
-		AMF_LOG_ERROR("Unknown Exception.");
-	}
-	data = nullptr;
+	if (data)
+		delete static_cast<Plugin::Interface::H264Interface*>(data);
 }
 
 bool Plugin::Interface::H264Interface::encode(void *data, struct encoder_frame *frame, struct encoder_packet *packet, bool *received_packet) {
 	try {
-		return static_cast<Plugin::Interface::H264Interface*>(data)->encode(frame, packet, received_packet);
+		if (data)
+			return static_cast<Plugin::Interface::H264Interface*>(data)->encode(frame, packet, received_packet);
 	} catch (std::exception e) {
-		AMF_LOG_ERROR("%s", e.what());
-	} catch (std::exception* e) {
-		AMF_LOG_ERROR("%s", e->what());
-		delete e;
-	} catch (...) {
-		AMF_LOG_ERROR("Unknown Exception.");
-		throw;
+		PLOG_ERROR("%s", e.what());
 	}
 	return false;
 }
@@ -163,396 +147,387 @@
 	obs_data_set_default_string(data, "rate_control", "");
 	obs_data_set_default_string(data, "profile", "");
 	obs_data_set_default_string(data, "preset", "");
-	obs_data_set_int(data, "bitrate", -1);
-	obs_data_set_int(data, "keyint_sec", -1);
-	obs_data_set_string(data, "rate_control", "");
-	obs_data_set_string(data, "profile", "");
-	obs_data_set_string(data, "preset", "");
 	#pragma endregion OBS - Enforce Streaming Service Restrictions
 
 	// Preset
-	obs_data_set_default_int(data, AMF_H264_PRESET, static_cast<int32_t>(Presets::None));

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/enc-h265.cpp Added

@@ -0,0 +1,1220 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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.
+*/
+
+
+//////////////////////////////////////////////////////////////////////////
+// New UI Design
+//////////////////////////////////////////////////////////////////////////
+// All: Preset
+// ----------- Static Section
+// Mas: Usage
+// All: Quality Preset
+// Adv: Profile
+// Adv: Profile Level
+// Adv: Tier
+// Mas: Aspect Ratio
+// Exp: Coding Type
+// Exp: Maximum Reference Frames
+// ----------- Rate Control Section
+// All: Rate Control Method
+// Adv: Pre-Pass Encoding (if supported)
+// All, CBR&VBR: Target Bitrate
+// All, VBR: Peak Bitrate
+// All, CQP: QP I/P
+// Adv, CBR&VBR: Min/Max I/P-Frame QP
+// CBR: Filler Data
+// Adv: Frame Skipping
+// Exp: VBAQ
+// Exp: Enforce HRD 
+// ----------- VBV Buffer
+// Adv: VBV Buffer Size
+// Exp: VBV Buffer Initial Fullness
+// ----------- Picture Control
+// All: Keyframe Interval (Float, uses GOP Size Fixed/Min/Max)
+// Mas: IDR Period (in GOPs)
+// Exp: GOP Type
+// Exp: GOP Size
+// Exp: GOP Size Min/Max
+// Exp: Deblocking Filter
+// Exp: Motion Estimation (Dropdown)
+// ----------- Intra-Refresh
+// ToDo: Master Mode only?
+// ----------- System
+// Adv: API
+// Adv: Adapter
+// Exp: OpenCL
+// All: View
+
+#include "enc-h265.h"
+#include "amf-capabilities.h"
+#include "amf-encoder.h"
+#include "amf-encoder-h265.h"
+#include "strings.h"
+#include "utility.h"
+
+#define PREFIX "[H265/HEVC]"
+
+using namespace Plugin::AMD;
+
+void Plugin::Interface::H265Interface::encoder_register() {
+	// Test if we actually have AVC support.
+	if (!AMD::CapabilityManager::Instance()->IsCodecSupported(Codec::HEVC)) {
+		PLOG_WARNING(PREFIX " Not supported by any GPU, disabling...");
+		return;
+	}
+
+	// Create structure
+	static std::unique_ptr<obs_encoder_info> encoder_info = std::make_unique<obs_encoder_info>();
+	std::memset(encoder_info.get(), 0, sizeof(obs_encoder_info));
+
+	// Initialize Structure
+	encoder_info->type = obs_encoder_type::OBS_ENCODER_VIDEO;
+	static const char* encoder_name = "amd_amf_h265";
+	encoder_info->id = encoder_name;
+	static const char* encoder_codec = "hevc";
+	encoder_info->codec = encoder_codec;
+
+	// Functions
+	encoder_info->get_name = &get_name;
+	encoder_info->get_defaults = &get_defaults;
+	encoder_info->get_properties = &get_properties;
+	encoder_info->create = &create;
+	encoder_info->destroy = &destroy;
+	encoder_info->encode = &encode;
+	encoder_info->update = &update;
+	encoder_info->get_video_info = &get_video_info;
+	encoder_info->get_extra_data = &get_extra_data;
+
+	obs_register_encoder(encoder_info.get());
+	PLOG_DEBUG(PREFIX " Registered.");
+}
+
+const char* Plugin::Interface::H265Interface::get_name(void*) {
+	static const char* name = "H265/HEVC Encoder (" PLUGIN_NAME ")";
+	return name;
+}
+
+void Plugin::Interface::H265Interface::get_defaults(obs_data_t *data) {
+	#pragma region OBS - Enforce Streaming Service Restrictions
+	obs_data_set_default_int(data, "bitrate", -1);
+	obs_data_set_default_int(data, "keyint_sec", -1);
+	obs_data_set_default_string(data, "rate_control", "");
+	obs_data_set_default_string(data, "profile", "");
+	obs_data_set_default_string(data, "preset", "");
+	obs_data_set_int(data, "bitrate", -1);
+	obs_data_set_int(data, "keyint_sec", -1);
+	obs_data_set_string(data, "rate_control", "");
+	obs_data_set_string(data, "profile", "");
+	obs_data_set_string(data, "preset", "");
+	#pragma endregion OBS - Enforce Streaming Service Restrictions
+
+	// Static
+	//obs_data_set_default_int(data, P_USAGE, static_cast<int64_t>(Usage::Transcoding));
+	obs_data_set_default_int(data, P_QUALITYPRESET, static_cast<int64_t>(QualityPreset::Balanced));
+	obs_data_set_default_int(data, P_PROFILE, static_cast<int64_t>(Profile::Main));
+	obs_data_set_default_int(data, P_PROFILELEVEL, static_cast<int64_t>(ProfileLevel::Automatic));
+	obs_data_set_default_int(data, P_TIER, static_cast<int64_t>(H265::Tier::Main));
+	//obs_data_set_default_frames_per_second(data, P_ASPECTRATIO, media_frames_per_second{ 1, 1 }, "");
+	obs_data_set_default_int(data, P_CODINGTYPE, static_cast<int64_t>(CodingType::Automatic));
+	obs_data_set_default_int(data, P_MAXIMUMREFERENCEFRAMES, 1);
+
+	// Rate Control
+	obs_data_set_int(data, ("last" P_RATECONTROLMETHOD), -1);
+	obs_data_set_default_int(data, ("last" P_RATECONTROLMETHOD), -1);
+	obs_data_set_default_int(data, P_RATECONTROLMETHOD, static_cast<int64_t>(RateControlMethod::ConstantBitrate));
+	obs_data_set_default_int(data, P_PREPASSMODE, static_cast<int64_t>(PrePassMode::Disabled));
+	obs_data_set_default_int(data, P_BITRATE_TARGET, 3500);
+	obs_data_set_default_int(data, P_BITRATE_PEAK, 9000);
+	obs_data_set_default_int(data, P_QP_IFRAME, 22);
+	obs_data_set_default_int(data, P_QP_PFRAME, 22);
+	obs_data_set_default_int(data, P_QP_BFRAME, 22);
+	obs_data_set_default_int(data, P_QP_IFRAME_MINIMUM, 18);
+	obs_data_set_default_int(data, P_QP_IFRAME_MAXIMUM, 51);
+	obs_data_set_default_int(data, P_QP_PFRAME_MINIMUM, 18);
+	obs_data_set_default_int(data, P_QP_PFRAME_MAXIMUM, 51);
+	obs_data_set_default_int(data, P_FILLERDATA, 1);
+	obs_data_set_default_int(data, P_FRAMESKIPPING, 0);
+	obs_data_set_default_int(data, P_VBAQ, 1);
+	obs_data_set_default_int(data, P_ENFORCEHRD, 0);
+
+	// VBV Buffer
+	obs_data_set_int(data, ("last" P_VBVBUFFER), -1);
+	obs_data_set_default_int(data, ("last" P_VBVBUFFER), -1);
+	obs_data_set_default_int(data, P_VBVBUFFER, 0);
+	obs_data_set_default_int(data, P_VBVBUFFER_SIZE, 3500);
+	obs_data_set_default_double(data, P_VBVBUFFER_STRICTNESS, 50);
+	obs_data_set_default_double(data, P_VBVBUFFER_INITIALFULLNESS, 100);
+
+	// Picture Control
+	obs_data_set_default_double(data, P_INTERVAL_KEYFRAME, 2.0);
+	obs_data_set_default_int(data, P_PERIOD_IDR_H265, 0);
+	obs_data_set_default_double(data, P_INTERVAL_IFRAME, 0.0);
+	obs_data_set_default_int(data, P_PERIOD_IFRAME, 0);
+	obs_data_set_default_double(data, P_INTERVAL_PFRAME, 0.0);
+	obs_data_set_default_int(data, P_PERIOD_PFRAME, 0);
+	obs_data_set_default_int(data, P_FRAMESKIPPING_PERIOD, 0);
+	obs_data_set_default_int(data, P_FRAMESKIPPING_BEHAVIOUR, 0);
+	obs_data_set_default_int(data, P_GOP_TYPE, static_cast<int64_t>(H265::GOPType::Fixed));
+	obs_data_set_default_int(data, P_GOP_SIZE, 60);
+	obs_data_set_default_int(data, P_GOP_SIZE_MINIMUM, 1);
+	obs_data_set_default_int(data, P_GOP_SIZE_MAXIMUM, 16);
+	obs_data_set_default_int(data, P_DEBLOCKINGFILTER, 1);
+	obs_data_set_default_int(data, P_MOTIONESTIMATION, 3);
+
+	// System Properties
+	obs_data_set_string(data, ("last" P_VIDEO_API), "");
+	obs_data_set_default_string(data, ("last" P_VIDEO_API), "");
+	obs_data_set_default_string(data, P_VIDEO_API, "");
+	obs_data_set_int(data, ("last" P_VIDEO_ADAPTER), 0);
+	obs_data_set_default_int(data, ("last" P_VIDEO_ADAPTER), 0);
+	obs_data_set_default_int(data, P_VIDEO_ADAPTER, 0);
+	obs_data_set_default_int(data, P_OPENCL_TRANSFER, 0);
+	obs_data_set_default_int(data, P_OPENCL_CONVERSION, 0);
+	obs_data_set_default_int(data, P_ASYNCHRONOUSQUEUE, 0);
+	obs_data_set_default_int(data, P_ASYNCHRONOUSQUEUE_SIZE, 4);
+	obs_data_set_int(data, ("last" P_VIEW), -1);
+	obs_data_set_default_int(data, ("last" P_VIEW), -1);
+	obs_data_set_default_int(data, P_VIEW, static_cast<int64_t>(ViewMode::Basic));
+	obs_data_set_default_bool(data, P_DEBUG, false);

obs-studio-18.0.1.tar.xz/plugins/enc-amf/Source/plugin.cpp -> obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/plugin.cpp Changed

@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2016 Michael Fabian Dirks
+Copyright (c) 2016-2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,19 +23,24 @@
 */
 
 #pragma once
-//////////////////////////////////////////////////////////////////////////
-// Includes
-//////////////////////////////////////////////////////////////////////////
-#include <windows.h>
-#include <sstream>
-#include <map>
-
-// Plugin
 #include "plugin.h"
 #include "api-base.h"
 #include "amf.h"
 #include "amf-capabilities.h"
+#include <sstream>
+
+#ifdef WITH_AVC
 #include "enc-h264.h"
+#endif
+#ifdef WITH_HEVC
+#include "enc-h265.h"
+#endif
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+using namespace Plugin;
+using namespace Plugin::AMD;
 
 //////////////////////////////////////////////////////////////////////////
 // Code
@@ -48,6 +53,123 @@
 OBS_MODULE_AUTHOR("Michael Fabian Dirks");
 OBS_MODULE_USE_DEFAULT_LOCALE("enc-amf", "en-US");
 
+#ifdef _DEBUG
+#include "components/VideoEncoderVCE.h"
+#include "components/VideoEncoderHEVC.h"
+
+static std::string fastPrintVariant(const char* text, amf::AMFVariantStruct variant) {
+	std::vector<char> buf(1024);
+	switch (variant.type) {
+		case amf::AMF_VARIANT_EMPTY:
+			snprintf(buf.data(), buf.size(), "%s%s", text, "Empty");
+			break;
+		case amf::AMF_VARIANT_BOOL:
+			snprintf(buf.data(), buf.size(), "%s%s", text, variant.boolValue ? "true" : "false");
+			break;
+		case amf::AMF_VARIANT_INT64:
+			snprintf(buf.data(), buf.size(), "%s%lld", text, variant.int64Value);
+			break;
+		case amf::AMF_VARIANT_DOUBLE:
+			snprintf(buf.data(), buf.size(), "%s%f", text, variant.doubleValue);
+			break;
+		case amf::AMF_VARIANT_RECT:
+			snprintf(buf.data(), buf.size(), "%s[%ld,%ld,%ld,%ld]", text,
+				variant.rectValue.top, variant.rectValue.left,
+				variant.rectValue.bottom, variant.rectValue.right);
+			break;
+		case amf::AMF_VARIANT_SIZE:
+			snprintf(buf.data(), buf.size(), "%s%ldx%ld", text,
+				variant.sizeValue.width, variant.sizeValue.height);
+			break;
+		case amf::AMF_VARIANT_POINT:
+			snprintf(buf.data(), buf.size(), "%s[%ld,%ld]", text,
+				variant.pointValue.x, variant.pointValue.y);
+			break;
+		case amf::AMF_VARIANT_RATE:
+			snprintf(buf.data(), buf.size(), "%s%ld/%ld", text,
+				variant.rateValue.num, variant.rateValue.den);
+			break;
+		case amf::AMF_VARIANT_RATIO:
+			snprintf(buf.data(), buf.size(), "%s%ld:%ld", text,
+				variant.ratioValue.num, variant.ratioValue.den);
+			break;
+		case amf::AMF_VARIANT_COLOR:
+			snprintf(buf.data(), buf.size(), "%s(%d,%d,%d,%d)", text,
+				variant.colorValue.r,
+				variant.colorValue.g,
+				variant.colorValue.b,
+				variant.colorValue.a);
+			break;
+		case amf::AMF_VARIANT_STRING:
+			snprintf(buf.data(), buf.size(), "%s'%s'", text,
+				variant.stringValue);
+			break;
+		case amf::AMF_VARIANT_WSTRING:
+			snprintf(buf.data(), buf.size(), "%s'%ls'", text,
+				variant.wstringValue);
+			break;
+	}
+	return std::string(buf.data());
+};
+
+static void printDebugInfo(amf::AMFComponentPtr m_AMFEncoder) {
+	amf::AMFPropertyInfo* pInfo;
+	size_t propCount = m_AMFEncoder->GetPropertyCount();
+	PLOG_INFO("-- Internal AMF Encoder Properties --");
+	for (size_t propIndex = 0; propIndex < propCount; propIndex++) {
+		static const char* typeToString[] = {
+			"Empty",
+			"Boolean",
+			"Int64",
+			"Double",
+			"Rect",
+			"Size",
+			"Point",
+			"Rate",
+			"Ratio",
+			"Color",
+			"String",
+			"WString",
+			"Interface"
+		};
+
+		AMF_RESULT res = m_AMFEncoder->GetPropertyInfo(propIndex, (const amf::AMFPropertyInfo**) &pInfo);
+		if (res != AMF_OK)
+			continue;
+
+		amf::AMFVariantStruct curStruct = amf::AMFVariantStruct();
+		m_AMFEncoder->GetProperty(pInfo->name, &curStruct);
+
+		auto vcur = fastPrintVariant("Current: ", curStruct);
+		auto vdef = fastPrintVariant("Default: ", pInfo->defaultValue);
+		auto vmin = fastPrintVariant("Minimum: ", pInfo->minValue);
+		auto vmax = fastPrintVariant("Maximum: ", pInfo->maxValue);
+		std::stringstream venum;
+		if (pInfo->pEnumDescription) {
+			const amf::AMFEnumDescriptionEntry* pEnumEntry = pInfo->pEnumDescription;
+			while (pEnumEntry->name != nullptr) {
+				QUICK_FORMAT_MESSAGE(tmp, "%ls[%ld]", pEnumEntry->name, pEnumEntry->value);
+				venum << tmp.c_str() << "; ";
+				pEnumEntry++;
+			}
+		}
+
+		PLOG_INFO("%ls(Description: %ls, Type: %s, Index %d, Content Type: %d, Access: %s%s%s, Values: {%s, %s, %s, %s%s%s})",
+			pInfo->name,
+			pInfo->desc,
+			typeToString[pInfo->type],
+			propIndex,
+			pInfo->contentType,
+			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_READ) ? "R" : "",
+			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE) ? "W" : "",
+			(pInfo->accessType & amf::AMF_PROPERTY_ACCESS_WRITE_RUNTIME) ? "X" : "",
+			vcur.c_str(), vdef.c_str(), vmin.c_str(), vmax.c_str(),
+			(venum.str().length() > 0) ? ", Enum: " : "", venum.str().c_str()
+		);
+	}
+}
+#endif
+
 /**
 * Required: Called when the module is loaded.  Use this function to load all
 * the sources/encoders/outputs/services for your module, or anything else that
@@ -57,59 +179,89 @@
 *                   false to indicate failure and unload the module
 */
 MODULE_EXPORT bool obs_module_load(void) {
-	AMF_LOG_DEBUG("<" __FUNCTION_NAME__ "> Loading...");
+	PLOG_DEBUG("<" __FUNCTION_NAME__ "> Loading...");
 
-	// Attempt to load AMF Runtime
+	// AMF
 	try {
-		Plugin::AMD::AMF::GetInstance();
-	} catch (std::exception& e) {
-		AMF_LOG_ERROR("%s", e.what());
-		return true;
-	} catch (std::exception* e) {
-		AMF_LOG_ERROR("%s", e->what());
-		delete e;
-		return true;
+		Plugin::AMD::AMF::Initialize();
+	} catch (const std::exception& e) {
+		PLOG_ERROR("Encountered Exception during AMF initialization: %s", e.what());
+		return false;
 	} catch (...) {
-		AMF_LOG_ERROR("Unknown Exception.");
-		return true;
+		PLOG_ERROR("Unexpected Exception during AMF initialization.");
+		return false;
 	}
 
 	// Initialize Graphics APIs
+	Plugin::API::InitializeAPIs();
+
+	// AMF Capabilities
 	try {

obs-studio-18.0.2.tar.xz/plugins/enc-amf/Source/utility.cpp Added

@@ -0,0 +1,792 @@
+/*
+MIT License
+
+Copyright (c) 2016-2017
+
+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
+
+// Plugin
+#include "utility.h"
+#include "amf.h"
+#include "amf-encoder.h"
+#include "components/VideoConverter.h"
+#ifdef WITH_AVC
+#include "amf-encoder-h264.h"
+#include "components/VideoEncoderVCE.h"
+#endif
+#ifdef WITH_HEVC
+#include "amf-encoder-h265.h"
+#include "components/VideoEncoderHEVC.h"
+#endif
+
+#include <map>
+#include <sstream>
+
+using namespace Plugin::AMD;
+
+uint64_t Utility::GetUniqueIdentifier() {
+	static std::mutex __mutex;
+	static uint64_t __curId;
+
+	const std::lock_guard<std::mutex> lock(__mutex);
+	return ++__curId;
+}
+
+static std::map<std::string, std::string> translatedMap;
+const char* Utility::obs_module_text_multi(const char *key, uint8_t depth) {
+	// Check if it already was translated.
+	if (!translatedMap.count(std::string(key))) { // If not, translate it now.
+		const char* out = obs_module_text(key);
+
+		// Allow for nested translations using \@...\@ sequences.
+		if (depth > 0) {
+			// I'm pretty sure this can be optimized a ton if necessary.
+
+			size_t seqStart = 0,
+				seqEnd = 0;
+			bool haveSequence = false;
+
+			std::stringstream fout;
+
+			// Walk the given string.
+			std::string walkable = std::string(out);
+
+			for (size_t pos = 0; pos <= walkable.length(); pos++) {
+				std::string walked = walkable.substr(pos, 2);
+
+				if (walked == "\\@") { // Sequence Start/End
+					if (haveSequence) {
+						seqEnd = pos;
+
+						std::string sequence = walkable.substr(seqStart, seqEnd - seqStart);
+						fout << obs_module_text_multi(sequence.c_str(), depth--);
+					} else {
+						seqStart = pos + 2;
+					}
+					haveSequence = !haveSequence;
+					pos = pos + 1;
+				} else if (!haveSequence) {
+					fout << walked.substr(0, 1); // Append the left character.
+				}
+			}
+
+			std::pair<std::string, std::string> kv = std::pair<std::string, std::string>(std::string(key), fout.str());
+			translatedMap.insert(kv);
+		} else {
+			return out;
+		}
+	}
+
+	auto value = translatedMap.find(std::string(key));
+	return value->second.c_str();
+}
+
+
+// Codec
+const char* Utility::CodecToString(Plugin::AMD::Codec v) {
+	switch (v) {
+		#ifdef WITH_AVC
+		case Codec::AVC:
+			return "H264/AVC";
+		case Codec::SVC:
+			return "H264/SVC";
+			#endif
+			#ifdef WITH_HEVC
+		case Codec::HEVC:
+			return "H265/HEVC";
+			#endif
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+const wchar_t* Utility::CodecToAMF(Plugin::AMD::Codec v) {
+	switch (v) {
+		#ifdef WITH_AVC
+		case Codec::AVC:
+			return AMFVideoEncoderVCE_AVC;
+		case Codec::SVC:
+			return AMFVideoEncoderVCE_SVC;
+			#endif
+			#ifdef WITH_HEVC
+		case Codec::HEVC:
+			return AMFVideoEncoder_HEVC;
+			#endif
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Color Format
+const char* Utility::ColorFormatToString(Plugin::AMD::ColorFormat v) {
+	switch (v) {
+		case ColorFormat::I420:
+			return "YUV 4:2:0";
+		case ColorFormat::NV12:
+			return "NV12";
+		case ColorFormat::YUY2:
+			return "YUY2";
+		case ColorFormat::BGRA:
+			return "BGRA";
+		case ColorFormat::RGBA:
+			return "RGBA";
+		case ColorFormat::GRAY:
+			return "GRAY";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+amf::AMF_SURFACE_FORMAT Utility::ColorFormatToAMF(Plugin::AMD::ColorFormat v) {
+	switch (v) {
+		case ColorFormat::I420:
+			return amf::AMF_SURFACE_YUV420P;
+		case ColorFormat::NV12:
+			return amf::AMF_SURFACE_NV12;
+		case ColorFormat::YUY2:
+			return amf::AMF_SURFACE_YUY2;
+		case ColorFormat::BGRA:
+			return amf::AMF_SURFACE_BGRA;
+		case ColorFormat::RGBA:
+			return amf::AMF_SURFACE_RGBA;
+		case ColorFormat::GRAY:
+			return amf::AMF_SURFACE_GRAY8;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Color Space
+const char* Utility::ColorSpaceToString(Plugin::AMD::ColorSpace v) {
+	switch (v) {
+		case ColorSpace::BT601:
+			return "601";
+		case ColorSpace::BT709:
+			return "709";
+		case ColorSpace::BT2020:
+			return "2020";
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM Utility::ColorSpaceToAMFConverter(Plugin::AMD::ColorSpace v) {
+	switch (v) {
+		case ColorSpace::BT601:
+			return AMF_VIDEO_CONVERTER_COLOR_PROFILE_601;
+		case ColorSpace::BT709:
+			return AMF_VIDEO_CONVERTER_COLOR_PROFILE_709;
+		case ColorSpace::BT2020:
+			return AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020;
+	}
+	throw std::runtime_error("Invalid Parameter");
+}
+
+// Usage
+const char* Utility::UsageToString(Plugin::AMD::Usage v) {
+	switch (v) {
+		case Usage::Transcoding:

obs-studio-18.0.1.tar.xz/plugins/image-source/image-source.c -> obs-studio-18.0.2.tar.xz/plugins/image-source/image-source.c Changed

obs-studio-18.0.1.tar.xz/plugins/linux-pulseaudio/pulse-input.c -> obs-studio-18.0.2.tar.xz/plugins/linux-pulseaudio/pulse-input.c Changed

obs-studio-18.0.1.tar.xz/plugins/mac-avcapture/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/plugins/mac-avcapture/CMakeLists.txt Changed

obs-studio-18.0.1.tar.xz/plugins/mac-avcapture/av-capture.mm -> obs-studio-18.0.2.tar.xz/plugins/mac-avcapture/av-capture.mm Changed

@@ -2,6 +2,7 @@
 #import <CoreFoundation/CoreFoundation.h>
 #import <CoreMedia/CoreMedia.h>
 #import <CoreVideo/CoreVideo.h>
+#import <CoreMediaIO/CMIOHardware.h>
 
 #include <obs-module.h>
 #include <obs.hpp>
@@ -780,7 +781,7 @@
 	CMMediaType mtype = CMFormatDescriptionGetMediaType(
 			format.formatDescription);
 	// TODO: support other media types
-	if (mtype != kCMMediaType_Video) {
+	if (mtype != kCMMediaType_Video && mtype != kCMMediaType_Muxed) {
 		AVLOG(LOG_ERROR, "CMMediaType '%s' is unsupported",
 				AV_FOURCC_STR(mtype));
 		return false;
@@ -1247,7 +1248,7 @@
 		AVCaptureSessionPreset640x480,
 		AVCaptureSessionPreset352x288,
 		AVCaptureSessionPreset320x240,
-		//AVCaptureSessionPresetHigh,
+		AVCaptureSessionPresetHigh,
 		//AVCaptureSessionPresetMedium,
 		//AVCaptureSessionPresetLow,
 		//AVCaptureSessionPresetPhoto,
@@ -1265,6 +1266,7 @@
 		AVCaptureSessionPreset640x480:@"640x480",
 		AVCaptureSessionPreset960x540:@"960x540",
 		AVCaptureSessionPreset1280x720:@"1280x720",
+		AVCaptureSessionPresetHigh:@"High",
 	};
 	NSString *name = preset_names[preset];
 	if (name)
@@ -2080,11 +2082,15 @@
 			TEXT_DEVICE, OBS_COMBO_TYPE_LIST,
 			OBS_COMBO_FORMAT_STRING);
 	obs_property_list_add_string(dev_list, "", "");
+
 	for (AVCaptureDevice *dev in [AVCaptureDevice
-			devicesWithMediaType:AVMediaTypeVideo]) {
-		obs_property_list_add_string(dev_list,
-				dev.localizedName.UTF8String,
-				dev.uniqueID.UTF8String);
+			devices]) {
+		if ([dev hasMediaType: AVMediaTypeVideo] ||
+		    [dev hasMediaType: AVMediaTypeMuxed]) {
+			obs_property_list_add_string(dev_list,
+					dev.localizedName.UTF8String,
+					dev.uniqueID.UTF8String);
+		}
 	}
 
 	obs_property_set_modified_callback(dev_list,
@@ -2178,6 +2184,20 @@
 
 bool obs_module_load(void)
 {
+#ifdef __MAC_10_10
+	// Enable iOS device to show up as AVCapture devices
+	// From WWDC video 2014 #508 at 5:34
+	// https://developer.apple.com/videos/wwdc/2014/#508
+	CMIOObjectPropertyAddress prop = {
+			kCMIOHardwarePropertyAllowScreenCaptureDevices,
+			kCMIOObjectPropertyScopeGlobal,
+			kCMIOObjectPropertyElementMaster
+	};
+	UInt32 allow = 1;
+	CMIOObjectSetPropertyData(kCMIOObjectSystemObject, &prop, 0, NULL,
+			sizeof(allow), &allow);
+#endif
+
 	obs_source_info av_capture_info = {
 		.id             = "av_capture_input",
 		.type           = OBS_SOURCE_TYPE_INPUT,

obs-studio-18.0.1.tar.xz/plugins/mac-capture/mac-audio.c -> obs-studio-18.0.2.tar.xz/plugins/mac-capture/mac-audio.c Changed

obs-studio-18.0.1.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt -> obs-studio-18.0.2.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt Changed

obs-studio-18.0.1.tar.xz/plugins/obs-ffmpeg/data/locale/en-US.ini -> obs-studio-18.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/en-US.ini Changed

@@ -23,21 +23,12 @@
 Looping="Loop"
 Input="Input"
 InputFormat="Input Format"
-ForceFormat="Force format conversion"
 HardwareDecode="Use hardware decoding when available"
 ClearOnMediaEnd="Hide source when playback ends"
 Advanced="Advanced"
-AudioBufferSize="Audio Buffer Size (frames)"
-VideoBufferSize="Video Buffer Size (frames)"
-FrameDropping="Frame Dropping Level"
-DiscardNone="None"
-DiscardDefault="Default (Invalid Packets)"
-DiscardNonRef="Non-Reference Frames"
-DiscardBiDir="Bi-Directional Frames"
-DiscardNonIntra="Non-Intra Frames"
-DiscardNonKey="Non-Key Frames"
-DiscardAll="All Frames (Careful!)"
 RestartWhenActivated="Restart playback when source becomes active"
+CloseFileWhenInactive="Close file when inactive"
+CloseFileWhenInactive.ToolTip="Closes the file when the source is not being displayed on the stream or\nrecording.  This allows the file to be changed when the source isn't active,\nbut there may be some startup delay when the source reactivates."
 ColorRange="YUV Color Range"
 ColorRange.Auto="Auto"
 ColorRange.Partial="Partial"

obs-studio-18.0.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c -> obs-studio-18.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c Changed

obs-studio-18.0.1.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c -> obs-studio-18.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c Changed

@@ -21,9 +21,7 @@
 #include "obs-ffmpeg-compat.h"
 #include "obs-ffmpeg-formats.h"
 
-#include <libff/ff-demuxer.h>
-
-#include <libswscale/swscale.h>
+#include <media-playback/media.h>
 
 #define FF_LOG(level, format, ...) \
 	blog(level, "[Media Source]: " format, ##__VA_ARGS__)
@@ -37,260 +35,28 @@
 static bool video_format(AVCodecContext *codec_context, void *opaque);
 
 struct ffmpeg_source {
-	struct ff_demuxer *demuxer;
+	mp_media_t media;
+	bool media_valid;
+	bool destroy_media;
+
 	struct SwsContext *sws_ctx;
 	int sws_width;
 	int sws_height;
 	enum AVPixelFormat sws_format;
 	uint8_t *sws_data;
 	int sws_linesize;
+	enum video_range_type range;
 	obs_source_t *source;
 
 	char *input;
 	char *input_format;
-	enum AVDiscard frame_drop;
-	enum video_range_type range;
-	int audio_buffer_size;
-	int video_buffer_size;
-	bool is_advanced;
 	bool is_looping;
-	bool is_forcing_scale;
 	bool is_hw_decoding;
 	bool is_clear_on_media_end;
 	bool restart_on_activate;
+	bool close_when_inactive;
 };
 
-static bool set_obs_frame_colorprops(struct ff_frame *frame,
-		struct ffmpeg_source *s, struct obs_source_frame *obs_frame)
-{
-	enum AVColorSpace frame_cs = av_frame_get_colorspace(frame->frame);
-	enum video_colorspace obs_cs;
-
-	switch(frame_cs) {
-	case AVCOL_SPC_BT709:       obs_cs = VIDEO_CS_709; break;
-	case AVCOL_SPC_SMPTE170M:
-	case AVCOL_SPC_BT470BG:     obs_cs = VIDEO_CS_601; break;
-	case AVCOL_SPC_UNSPECIFIED: obs_cs = VIDEO_CS_DEFAULT; break;
-	default:
-		FF_BLOG(LOG_WARNING, "frame using an unsupported colorspace %d",
-				frame_cs);
-		obs_cs = VIDEO_CS_DEFAULT;
-	}
-
-	enum video_range_type range;
-	obs_frame->format = ffmpeg_to_obs_video_format(frame->frame->format);
-	obs_frame->full_range =
-		frame->frame->color_range == AVCOL_RANGE_JPEG;
-
-	if (s->range != VIDEO_RANGE_DEFAULT)
-		obs_frame->full_range = s->range == VIDEO_RANGE_FULL;
-
-	range = obs_frame->full_range ? VIDEO_RANGE_FULL : VIDEO_RANGE_PARTIAL;
-
-	if (!video_format_get_parameters(obs_cs,
-			range, obs_frame->color_matrix,
-			obs_frame->color_range_min,
-			obs_frame->color_range_max)) {
-		FF_BLOG(LOG_ERROR, "Failed to get video format "
-                                "parameters for video format %u",
-                                obs_cs);
-		return false;
-	}
-
-	return true;
-}
-
-bool update_sws_context(struct ffmpeg_source *s, AVFrame *frame)
-{
-	if (frame->width != s->sws_width
-			|| frame->height != s->sws_height
-			|| frame->format != s->sws_format) {
-		if (s->sws_ctx != NULL)
-			sws_freeContext(s->sws_ctx);
-
-		if (frame->width <= 0 || frame->height <= 0) {
-			FF_BLOG(LOG_ERROR, "unable to create a sws "
-					"context that has a width(%d) or "
-					"height(%d) of zero.", frame->width,
-					frame->height);
-			goto fail;
-		}
-
-		s->sws_ctx = sws_getContext(
-			frame->width,
-			frame->height,
-			frame->format,
-			frame->width,
-			frame->height,
-			AV_PIX_FMT_BGRA,
-			SWS_BILINEAR,
-			NULL, NULL, NULL);
-
-		if (s->sws_ctx == NULL) {
-			FF_BLOG(LOG_ERROR, "unable to create sws "
-					"context with src{w:%d,h:%d,f:%d}->"
-					"dst{w:%d,h:%d,f:%d}",
-					frame->width, frame->height,
-					frame->format, frame->width,
-					frame->height, AV_PIX_FMT_BGRA);
-			goto fail;
-
-		}
-
-		if (s->sws_data != NULL)
-			bfree(s->sws_data);
-		s->sws_data = bzalloc(frame->width * frame->height * 4);
-		if (s->sws_data == NULL) {
-			FF_BLOG(LOG_ERROR, "unable to allocate sws "
-					"pixel data with size %d",
-					frame->width * frame->height * 4);
-			goto fail;
-		}
-
-		s->sws_linesize = frame->width * 4;
-		s->sws_width = frame->width;
-		s->sws_height = frame->height;
-		s->sws_format = frame->format;
-	}
-
-	return true;
-
-fail:
-	if (s->sws_ctx != NULL)
-		sws_freeContext(s->sws_ctx);
-	s->sws_ctx = NULL;
-
-	if (s->sws_data)
-		bfree(s->sws_data);
-	s->sws_data = NULL;
-
-	s->sws_linesize = 0;
-	s->sws_width = 0;
-	s->sws_height = 0;
-	s->sws_format = 0;
-
-	return false;
-}
-
-static bool video_frame_scale(struct ff_frame *frame,
-		struct ffmpeg_source *s, struct obs_source_frame *obs_frame)
-{
-	if (!update_sws_context(s, frame->frame))
-		return false;
-
-	sws_scale(
-		s->sws_ctx,
-		(uint8_t const *const *)frame->frame->data,
-		frame->frame->linesize,
-		0,
-		frame->frame->height,
-		&s->sws_data,
-		&s->sws_linesize
-	);
-
-	obs_frame->data[0]     = s->sws_data;
-	obs_frame->linesize[0] = s->sws_linesize;
-	obs_frame->format      = VIDEO_FORMAT_BGRA;
-
-	obs_source_output_video(s->source, obs_frame);
-
-	return true;
-}
-
-static bool video_frame_hwaccel(struct ff_frame *frame,
-		struct ffmpeg_source *s, struct obs_source_frame *obs_frame)
-{
-	// 4th plane is pixelbuf reference for mac
-	for (int i = 0; i < 3; i++) {
-		obs_frame->data[i] = frame->frame->data[i];
-		obs_frame->linesize[i] = frame->frame->linesize[i];
-	}
-
-	if (!set_obs_frame_colorprops(frame, s, obs_frame))
-		return false;
-
-	obs_source_output_video(s->source, obs_frame);
-	return true;
-}
-
-static bool video_frame_direct(struct ff_frame *frame,
-		struct ffmpeg_source *s, struct obs_source_frame *obs_frame)
-{

obs-studio-18.0.1.tar.xz/plugins/obs-outputs/flv-mux.c -> obs-studio-18.0.2.tar.xz/plugins/obs-outputs/flv-mux.c Changed

obs-studio-18.0.1.tar.xz/plugins/obs-outputs/rtmp-stream.c -> obs-studio-18.0.2.tar.xz/plugins/obs-outputs/rtmp-stream.c Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/common_directx11.cpp -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/common_directx11.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/common_directx9.h -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/common_directx9.h Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/common_utils.h -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/common_utils.h Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/device_directx9.cpp -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/device_directx9.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/device_directx9.h -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/device_directx9.h Changed

obs-studio-18.0.1.tar.xz/plugins/obs-qsv11/obs-qsv11.c -> obs-studio-18.0.2.tar.xz/plugins/obs-qsv11/obs-qsv11.c Changed

obs-studio-18.0.1.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-18.0.2.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-18.0.1.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-18.0.2.tar.xz/plugins/rtmp-services/data/services.json Changed

@@ -136,7 +136,7 @@
             ],
             "recommended": {
                 "keyint": 2,
-                "max video bitrate": 3500,
+                "max video bitrate": 6000,
                 "max audio bitrate": 160,
                 "x264opts": "scenecut=0"
             }
@@ -637,6 +637,10 @@
                     "url": "rtmp://singapore.restream.io/live"
                 },
                 {
+                    "name": "Asia (Seoul, South Korea)",
+                    "url": "rtmp://seoul.restream.io/live"
+                },
+                {
                     "name": "Australia (Sydney)",
                     "url": "rtmp://au.restream.io/live"
                 }
@@ -838,8 +842,8 @@
             "recommended": {
                 "keyint": 2,
                 "profile": "main",
-                "max video bitrate": 2000,
-                "max audio bitrate": 160
+                "max video bitrate": 3500,
+                "max audio bitrate": 128
             }
         },
         {
@@ -850,6 +854,15 @@
                     "url": "rtmp://plive.pandora.tv:80/mediaHub"
                 }
             ]
+        },
+        {
+            "name": "LiveStream",
+            "servers": [
+                {
+                    "name": "Primary",
+                    "url": "rtmp://rtmpin.livestreamingest.com/rtmpin"
+                }
+            ]
         }
     ]
 }

obs-studio-18.0.1.tar.xz/plugins/win-capture/data/locale/en-US.ini -> obs-studio-18.0.2.tar.xz/plugins/win-capture/data/locale/en-US.ini Changed

obs-studio-18.0.1.tar.xz/plugins/win-capture/game-capture.c -> obs-studio-18.0.2.tar.xz/plugins/win-capture/game-capture.c Changed

obs-studio-18.0.1.tar.xz/plugins/win-capture/get-graphics-offsets/d3d9-offsets.cpp -> obs-studio-18.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/d3d9-offsets.cpp Changed

@@ -81,46 +81,131 @@
 
 #ifdef _WIN64
 
-#define CMP_SIZE 21
-
-static const uint8_t mask[CMP_SIZE] =
-{0xF8, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
- 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
- 0xFF, 0x00,
- 0xF8, 0xF8, 0x00, 0x00, 0x00, 0x00};
-
-static const uint8_t mask_cmp[CMP_SIZE] =
-{0x48, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
- 0x39, 0x80, 0x00, 0x00, 0x00, 0x00,
- 0x75, 0x00,
- 0x40, 0xB8, 0x00, 0x00, 0x00, 0x00};
+#define MAX_CMP_SIZE 22
+
+static const uint8_t mask[][MAX_CMP_SIZE] = {
+	{
+		0xF8, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0x00,
+		0xF8, 0xF8, 0x00, 0x00, 0x00, 0x00
+	},
+	{
+		0xF8, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0x00,
+		0xF8, 0xF8, 0x00, 0x00, 0x00, 0x00
+	}
+};
+
+static const uint8_t mask_cmp[][MAX_CMP_SIZE] = {
+	/*
+	* Windows 7
+	* 48 8B 83 B8 3D 00 00                    mov     rax, [rbx+3DB8h]
+	* 44 39 B8 68 50 00 00                    cmp     [rax+5068h], r15d
+	* 75 12                                   jnz     short loc_7FF7AA90530
+	* 41 B8 F9 19 00 00                       mov     r8d, 19F9h
+	*/
+	{
+		0x48, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
+		0x44, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x75, 0x00,
+		0x40, 0xB8, 0x00, 0x00, 0x00, 0x00
+	},
+	/*
+	* Windows ???+
+	* 49 8B 87 78 41 00 00                    mov     rax, [r15+4178h]
+	* 39 98 E0 51 00 00                       cmp     [rax+51E0h], ebx
+	* 75 12                                   jnz     short loc_1800AEC9C
+	* 41 B9 C3 1A 00 00                       mov     r9d, 1AC3h
+	*/
+	{
+		0x48, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
+		0x39, 0x80, 0x00, 0x00, 0x00, 0x00,
+		0x75, 0x00,
+		0x40, 0xB8, 0x00, 0x00, 0x00, 0x00
+	}
+};
+
+// Offset into the code for the numbers we're interested in
+static const uint32_t code_offsets[][2] = {
+	{3, 10},
+	{3, 9},
+};
 #else
 
-#define CMP_SIZE 19
+#define MAX_CMP_SIZE 20
+
+static const uint8_t mask[][MAX_CMP_SIZE] = {
+	{
+		0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0x00,
+		0xFF, 0x00, 0x00, 0x00, 0x00
+	},
+	{
+		0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0xFF,
+		0xFF, 0x00,
+		0xFF, 0x00, 0x00, 0x00, 0x00
+	}
+};
 
-static const uint8_t mask[CMP_SIZE] =
-{0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
- 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00,
- 0xFF, 0x00,
- 0xFF, 0x00, 0x00, 0x00, 0x00};
+static const uint8_t mask_cmp[][MAX_CMP_SIZE] = {
+	/*
+	* Windows 7+
+	* 8B 83 E8 29 00 00      mov     eax, [ebx+29E8h]
+	* 39 B0 80 4B 00 00      cmp     [eax+4B80h], esi
+	* 75 14                  jnz     short loc_754CD9E1
+	* 68 F9 19 00 00         push    19F9h
+	*/
+	{
+		0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
+		0x39, 0x80, 0x00, 0x00, 0x00, 0x00,
+		0x75, 0x00,
+		0x68, 0x00, 0x00, 0x00, 0x00
+	},
+
+	/* Windows 10 Creator's Update+
+	* 8B 86 F8 2B 00 00      mov     eax, [esi+2BF8h]
+	* 83 B8 00 4D 00 00 00   cmp     dword ptr [eax+4D00h], 0
+	* 75 0F                  jnz     short loc_100D793C
+	* 68 C3 1A 00 00         push    1AC3h
+	*/
+	{
+		0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
+		0x83, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x75, 0x00,
+		0x68, 0x00, 0x00, 0x00, 0x00
+	}
+};
 
-static const uint8_t mask_cmp[CMP_SIZE] =
-{0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
- 0x39, 0x80, 0x00, 0x00, 0x00, 0x00,
- 0x75, 0x00,
- 0x68, 0x00, 0x00, 0x00, 0x00};
+// Offset into the code for the numbers we're interested in
+static const uint32_t code_offsets[][2] = {
+	{2, 8},
+	{2, 8},
+};
 #endif
 
 #define MAX_FUNC_SCAN_BYTES 200
 
-static inline bool pattern_matches(uint8_t *byte)
+static inline bool pattern_matches(uint8_t *byte, uint32_t *offset1,
+	uint32_t *offset2)
 {
-	for (size_t i = 0; i < CMP_SIZE; i++) {
-		if ((byte[i] & mask[i]) != mask_cmp[i])
-			return false;
+	for (size_t j = 0; j < sizeof(mask) / sizeof(mask[0]); j++) {
+		for (size_t i = 0; i < MAX_CMP_SIZE; i++) {
+			if ((byte[i] & mask[j][i]) != mask_cmp[j][i])
+				goto next_signature;
+		}
+
+		*offset1 = code_offsets[j][0];
+		*offset2 = code_offsets[j][1];
+
+		return true;
+next_signature:;
 	}
 
-	return true;
+	return false;
 }
 
 void get_d3d9_offsets(struct d3d9_offsets *offsets)
@@ -138,16 +223,12 @@
 		offsets->present_swap = vtable_offset(info.module, info.swap,
 				3);
 
+		uint32_t offset1, offset2;
 		for (size_t i = 0; i < MAX_FUNC_SCAN_BYTES; i++) {
-			if (pattern_matches(&crr[i])) {
+			if (pattern_matches(&crr[i], &offset1, &offset2)) {
 #define get_offset(x) *(uint32_t*)&crr[i + x]
-#ifdef _WIN64
-				uint32_t off1 = get_offset(3);
-				uint32_t off2 = get_offset(9);
-#else
-				uint32_t off1 = get_offset(2);
-				uint32_t off2 = get_offset(8);
-#endif
+				uint32_t off1 = get_offset(offset1);
+				uint32_t off2 = get_offset(offset2);
 
 				/* check to make sure offsets are within
 				 * expected values */

obs-studio-18.0.1.tar.xz/plugins/win-capture/graphics-hook/d3d8-capture.cpp -> obs-studio-18.0.2.tar.xz/plugins/win-capture/graphics-hook/d3d8-capture.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/win-capture/window-helpers.c -> obs-studio-18.0.2.tar.xz/plugins/win-capture/window-helpers.c Changed

@@ -347,41 +347,41 @@
 	struct dstr cur_class = {0};
 	struct dstr cur_title = {0};
 	struct dstr cur_exe   = {0};
-	int         class_val = 1;
-	int         title_val = 1;
-	int         exe_val   = 0;
-	int         total     = 0;
+	int val = 0x7FFFFFFF;
 
 	if (!get_window_exe(&cur_exe, window))
-		return 0;
+		return 0x7FFFFFFF;
 	get_window_title(&cur_title, window);
 	get_window_class(&cur_class, window);
 
-	if (priority == WINDOW_PRIORITY_CLASS)
-		class_val += 3;
-	else if (priority == WINDOW_PRIORITY_TITLE)
-		title_val += 3;
-	else
-		exe_val += 3;
+	bool class_matches = dstr_cmpi(&cur_class, class) == 0;
+	bool exe_matches = dstr_cmpi(&cur_exe, exe) == 0;
+	int title_val = abs(dstr_cmpi(&cur_title, title));
 
+	/* always match by name with UWP windows */
 	if (uwp_window) {
-		if (dstr_cmpi(&cur_title, title) == 0 &&
-		    dstr_cmpi(&cur_exe, exe) == 0)
-			total += exe_val + title_val + class_val;
-	} else {
-		if (dstr_cmpi(&cur_class, class) == 0)
-			total += class_val;
-		if (dstr_cmpi(&cur_title, title) == 0)
-			total += title_val;
-		if (dstr_cmpi(&cur_exe, exe) == 0)
-			total += exe_val;
+		if (priority == WINDOW_PRIORITY_EXE && !exe_matches)
+			val = 0x7FFFFFFF;
+		else
+			val = title_val == 0 ? 0 : 0x7FFFFFFF;
+
+	} else if (priority == WINDOW_PRIORITY_CLASS) {
+		val = class_matches ? title_val : 0x7FFFFFFF;
+		if (val != 0x7FFFFFFF && !exe_matches)
+			val += 0x1000;
+
+	} else if (priority == WINDOW_PRIORITY_TITLE) {
+		val = title_val == 0 ? 0 : 0x7FFFFFFF;
+
+	} else if (priority == WINDOW_PRIORITY_EXE) {
+		val = exe_matches ? title_val : 0x7FFFFFFF;
 	}
 
 	dstr_free(&cur_class);
 	dstr_free(&cur_title);
 	dstr_free(&cur_exe);
 
-	return total;
+	return val;
 }
 
 HWND find_window(enum window_search_mode mode,
@@ -395,7 +395,7 @@
 
 	HWND window      = first_window(mode, &parent, &use_findwindowex);
 	HWND best_window = NULL;
-	int  best_rating = 0;
+	int  best_rating = 0x7FFFFFFF;
 
 	if (!class)
 		return NULL;
@@ -405,9 +405,11 @@
 	while (window) {
 		int rating = window_rating(window, priority, class, title, exe,
 				uwp_window);
-		if (rating > best_rating) {
+		if (rating < best_rating) {
 			best_rating = rating;
 			best_window = window;
+			if (rating == 0)
+				break;
 		}
 
 		window = next_window(window, mode, &parent, use_findwindowex);

obs-studio-18.0.1.tar.xz/plugins/win-dshow/ffmpeg-decode.c -> obs-studio-18.0.2.tar.xz/plugins/win-dshow/ffmpeg-decode.c Changed

obs-studio-18.0.2.tar.xz/plugins/win-dshow/libdshowcapture/.gitattributes Added

obs-studio-18.0.1.tar.xz/plugins/win-dshow/win-dshow.cpp -> obs-studio-18.0.2.tar.xz/plugins/win-dshow/win-dshow.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/win-ivcam/realsense.cpp -> obs-studio-18.0.2.tar.xz/plugins/win-ivcam/realsense.cpp Changed

obs-studio-18.0.1.tar.xz/plugins/win-wasapi/win-wasapi.cpp -> obs-studio-18.0.2.tar.xz/plugins/win-wasapi/win-wasapi.cpp Changed

Changes of Revision 45