lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 26.0.0+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/decklink/DecklinkBase.cpp
View file

@ -15,4 +15,8 @@ bool DecklinkBase::Activate(DeckLinkDevice *, long long)
return false;
}
void DecklinkBase::Deactivate() {}
bool DecklinkBase::Activate(DeckLinkDevice *, long long, BMDVideoConnection,
BMDAudioConnection)
{
return false;
}

5
plugins/decklink/DecklinkBase.h
View file

@ -27,7 +27,10 @@ protected:
public:
virtual bool Activate(DeckLinkDevice *device, long long modeId);
virtual void Deactivate();
virtual bool Activate(DeckLinkDevice *device, long long modeId,
BMDVideoConnection bmdVideoConnection,
BMDAudioConnection bmdAudioConnection);
virtual void Deactivate() = 0;
DeckLinkDevice *GetDevice() const;
};

4
plugins/decklink/DecklinkInput.hpp
View file

@ -41,8 +41,8 @@ public:
bool Activate(DeckLinkDevice *device, long long modeId,
BMDVideoConnection bmdVideoConnection,
BMDAudioConnection bmdAudioConnection);
void Deactivate();
BMDAudioConnection bmdAudioConnection) override;
void Deactivate() override;
bool Capturing();
bool buffering = false;

4
plugins/decklink/data/locale/ar-SA.ini
View file

@ -3,7 +3,9 @@ Device="الجهاز"
Mode="الوضع"
Buffering="استخدام التخزين المؤقت"
PixelFormat="صيغة البكسل"
ColorSpace="مساحة الألوان"
ColorSpace.Default="الافتراضي"
ColorRange="نظاق اللون"
ColorRange.Default="الافتراضي"
ColorRange.Partial="جزئي"
ColorRange.Full="كامل"
@ -17,6 +19,8 @@ ChannelFormat.5_1ch="5.1ch"
ChannelFormat.7_1ch="7.1ch"
DeactivateWhenNotShowing="التعطيل عندما لا يكون ظاهراً"
AutoStart="البدء تلقائياً مع التشغيل"
SwapFC-LFE="التبديل بين الـ FC و الـ LFE"
SwapFC-LFE.Tooltip="التبديل بين قناة الوسط الأمامية و الصب ووفر"
VideoConnection="مدخل الفيديو"
AudioConnection="مدخل الصوت"

2
plugins/decklink/data/locale/az-AZ.ini Normal file
View file

@ -0,0 +1,2 @@
ChannelFormat.None="Heç biri"

6
plugins/decklink/data/locale/ba-RU.ini Normal file
View file

@ -0,0 +1,6 @@
Device="Яйланма"
Mode="Үтәмлек"
ColorSpace.Default="Ғәҙәти"
ColorRange.Full="Тулы"
ChannelFormat.None="Юҡ"

2
plugins/decklink/data/locale/bn-BD.ini
View file

@ -1,5 +1,5 @@
BlackmagicDevice="Blackmagic যন্ত্র"
Device="ডিভাইস"
Device="যন্ত্র"
PixelFormat="পিক্সেল বিন্যাস"
ColorRange.Partial="আংশিক"
ColorRange.Full="পূর্ণ"

26
plugins/decklink/data/locale/en-GB.ini Normal file
View file

@ -0,0 +1,26 @@
BlackmagicDevice="Blackmagic Device"
Device="Device"
Mode="Mode"
Buffering="Use Buffering"
PixelFormat="Pixel Format"
ColorSpace="Colour Space"
ColorSpace.Default="Default"
ColorRange="Colour Range"
ColorRange.Default="Default"
ColorRange.Partial="Partial"
ColorRange.Full="Full"
ChannelFormat="Channel"
ChannelFormat.None="None"
ChannelFormat.2_0ch="2ch"
ChannelFormat.2_1ch="2.1ch"
ChannelFormat.4_0ch="4ch"
ChannelFormat.4_1ch="4.1ch"
ChannelFormat.5_1ch="5.1ch"
ChannelFormat.7_1ch="7.1ch"
DeactivateWhenNotShowing="Deactivate when not showing"
AutoStart="Auto start on launch"
SwapFC-LFE="Swap FC and LFE"
SwapFC-LFE.Tooltip="Swap Front Centre Channel and LFE Channel"
VideoConnection="Video Connection"
AudioConnection="Audio Connection"

8
plugins/decklink/data/locale/fil-PH.ini
View file

@ -3,7 +3,9 @@ Device="Kagamitan"
Mode="Mode"
Buffering="Gamitin ang Buffering"
PixelFormat="Format ng Pixel"
ColorSpace="Espasyo ng Kulay"
ColorSpace.Default="Pangunahin"
ColorRange="Saklaw ng Kulay"
ColorRange.Default="Pangunahin"
ColorRange.Partial="Bahagyang"
ColorRange.Full="Buong"
@ -15,4 +17,10 @@ ChannelFormat.4_0ch="4ch"
ChannelFormat.4_1ch="4.1ch"
ChannelFormat.5_1ch="5.1ch"
ChannelFormat.7_1ch="7.1ch"
DeactivateWhenNotShowing="I-Deactivate kapag di nagpapakita"
AutoStart="Auto start pag nag-launch"
SwapFC-LFE="I-swap ang FC at LFE"
SwapFC-LFE.Tooltip="I-swap ang Front Center Channel at LFE Channel"
VideoConnection="Koneksyon ng Video"
AudioConnection="Koneksyon ng Audio"

10
plugins/decklink/data/locale/he-IL.ini
View file

@ -3,4 +3,14 @@ Device="התקן"
Mode="מצב"
Buffering="השתמש באוגר"
PixelFormat="תבנית פיקסלים"
ColorSpace="מרחב צבע"
ColorSpace.Default="ברירת מחדל"
ColorRange="טווח צבעים"
ColorRange.Default="ברירת מחדל"
ColorRange.Partial="חלקי"
ColorRange.Full="מלא"
ChannelFormat="ערוץ"
ChannelFormat.None="ללא"
VideoConnection="חיבור וידאו"
AudioConnection="חיבור שמע"

15
plugins/decklink/data/locale/hr-HR.ini
View file

@ -1,6 +1,17 @@
BlackmagicDevice="Blackmagic uređaj"
Device="Uređaj"
Mode="Režim"
Mode="Format"
Buffering="Koristi baferovanje"
PixelFormat="Piksel format"
PixelFormat="Format piksela"
ColorSpace="Prostor boja"
ColorRange.Partial="Djelomično"
ColorRange.Full="Potpuno"
ChannelFormat.2_0ch="Stereo"
ChannelFormat.2_1ch="2.1-kanalni"
ChannelFormat.4_0ch="4-kanalni"
ChannelFormat.4_1ch="4.1-kanalni"
ChannelFormat.5_1ch="5.1-kanalni"
ChannelFormat.7_1ch="7.1-kanalni"
DeactivateWhenNotShowing="Deaktiviraj kada se ne prikazuje"
AutoStart="Automatski započni pri pokretanju"

26
plugins/decklink/data/locale/id-ID.ini Normal file
View file

@ -0,0 +1,26 @@
BlackmagicDevice="Perangkat Blackmagic"
Device="Perangkat"
Mode="Mode"
Buffering="Gunakan Buffering"
PixelFormat="Format Piksel"
ColorSpace="Ruang Warna"
ColorSpace.Default="Default"
ColorRange="Rentang Warna"
ColorRange.Default="Default"
ColorRange.Partial="Sebagian"
ColorRange.Full="Penuh"
ChannelFormat="Saluran"
ChannelFormat.None="Tidak ada"
ChannelFormat.2_0ch="Stereo"
ChannelFormat.2_1ch="2.1"
ChannelFormat.4_0ch="4.0"
ChannelFormat.4_1ch="4.1"
ChannelFormat.5_1ch="5.1"
ChannelFormat.7_1ch="7.1"
DeactivateWhenNotShowing="Nonaktifkan saat tidak tampil"
AutoStart="Jalankan otomatis saat memulai"
SwapFC-LFE="Tukar FC dan LFE"
SwapFC-LFE.Tooltip="Tukar Saluran Tengah Depan dan Saluran LFE (subwoofer)"
VideoConnection="Koneksi Video"
AudioConnection="Koneksi Audio"

5
plugins/decklink/data/locale/lt-LT.ini Normal file
View file

@ -0,0 +1,5 @@
BlackmagicDevice="Blackmgaic įrenginys"
ChannelFormat.2_0ch="2 kanalas"
ChannelFormat.2_1ch="2.1 kanalas"
ChannelFormat.5_1ch="5.1 kanalas"

4
plugins/decklink/data/locale/pt-PT.ini
View file

@ -3,7 +3,9 @@ Device="Dispositivo"
Mode="Modo"
Buffering="Utilizar Buffering"
PixelFormat="Formato de pixel"
ColorSpace="Espaço de Cor"
ColorSpace.Default="Predefinido"
ColorRange="Intervalo de cores"
ColorRange.Default="Predefinido"
ColorRange.Partial="Parcial"
ColorRange.Full="Completo"
@ -17,6 +19,8 @@ ChannelFormat.5_1ch="5.1ch"
ChannelFormat.7_1ch="7.1ch"
DeactivateWhenNotShowing="Desativar quando não visível"
AutoStart="Iniciar automaticamente ao arrancar"
SwapFC-LFE="Trocar FC e LFE"
SwapFC-LFE.Tooltip="Trocar canal de centro frontal e canal LFE"
VideoConnection="Conexão de Vídeo"
AudioConnection="Conexão de Audio"

14
plugins/decklink/data/locale/ro-RO.ini
View file

@ -1,7 +1,7 @@
BlackmagicDevice="Dispozitiv Blackmagic"
Device="Dispozitiv"
Mode="Mod"
Buffering="Folosește zona tampon"
Buffering="Folosește buffering"
PixelFormat="Format pentru pixeli"
ColorSpace="Spațiu de culori"
ColorSpace.Default="Implicit"
@ -9,6 +9,18 @@ ColorRange="Gamă de culori"
ColorRange.Default="Implicit"
ColorRange.Partial="Parțială"
ColorRange.Full="Completă"
ChannelFormat="Canal"
ChannelFormat.None="Niciuna"
ChannelFormat.2_0ch="2ch"
ChannelFormat.2_1ch="2.1ch"
ChannelFormat.4_0ch="4ch"
ChannelFormat.4_1ch="4.1ch"
ChannelFormat.5_1ch="5.1ch"
ChannelFormat.7_1ch="7.1ch"
DeactivateWhenNotShowing="Dezactivează când nu se afișează"
AutoStart="Pornire automată la lansare"
SwapFC-LFE="Schimbă FC și LFE"
SwapFC-LFE.Tooltip="Schimbă canalul din Front Center și canalul LFE"
VideoConnection="Conexiune video"
AudioConnection="Conexiune audio"

2
plugins/decklink/data/locale/sv-SE.ini
View file

@ -18,7 +18,7 @@ ChannelFormat.4_1ch="4.1 kanaler"
ChannelFormat.5_1ch="5.1 kanaler"
ChannelFormat.7_1ch="7.1 kanaler"
DeactivateWhenNotShowing="Inaktivera när den inte visas"
AutoStart="Autostarta vid uppstart"
AutoStart="Starta automatiskt vid uppstart"
SwapFC-LFE="Byt FC och LFE"
SwapFC-LFE.Tooltip="Byt Front Center-kanal och LFE-kanal"
VideoConnection="Videoanslutning"

12
plugins/decklink/data/locale/ta-IN.ini Normal file
View file

@ -0,0 +1,12 @@
BlackmagicDevice="Blackmagic சாதனம்"
Device="சாதனம்"
Mode="பயன்முறை"
PixelFormat="பிக்சல் வடிவமைப்பு"
ColorSpace.Default="இயல்புநிலை"
ColorRange.Default="இயல்புநிலை"
ColorRange.Full="முழு"
ChannelFormat="சேனல்"
ChannelFormat.None="எதுவுமில்லை"
VideoConnection="காணொளி இணைப்பு"
AudioConnection="ஒலி இணைப்பு"

10
plugins/decklink/data/locale/uk-UA.ini
View file

@ -1,7 +1,7 @@
BlackmagicDevice="Blackmagic пристрій"
BlackmagicDevice="Пристрій Blackmagic"
Device="Пристрій"
Mode="Режим"
Buffering="Увімкнути буферизацію"
Buffering="Використовувати буферизацію"
PixelFormat="Формат пікселів"
ColorSpace="Колірний простір"
ColorSpace.Default="За замовчуванням"
@ -9,7 +9,7 @@ ColorRange="Колірний діапазон"
ColorRange.Default="За замовчуванням"
ColorRange.Partial="Частковий"
ColorRange.Full="Повний"
ChannelFormat="Звук (канали)"
ChannelFormat="Канал"
ChannelFormat.None="Немає"
ChannelFormat.2_0ch="2-канальний"
ChannelFormat.2_1ch="2.1-канальний"
@ -21,6 +21,6 @@ DeactivateWhenNotShowing="Деактивувати, коли не виводит
AutoStart="Запускати автоматично"
SwapFC-LFE="Поміняти місцями FC та LFE"
SwapFC-LFE.Tooltip="Міняє місцями Front Center та LFE канали"
VideoConnection="Відео вхід"
AudioConnection="Аудіо вхід"
VideoConnection="Підключення відео"
AudioConnection="Підключення звуку"

4
plugins/decklink/data/locale/zh-CN.ini
View file

@ -7,8 +7,8 @@ ColorSpace="色彩空间"
ColorSpace.Default="默认"
ColorRange="色彩范围"
ColorRange.Default="默认"
ColorRange.Partial="局部"
ColorRange.Full="全部"
ColorRange.Partial="Limited"
ColorRange.Full="Full"
ChannelFormat="频道"
ChannelFormat.None="无"
ChannelFormat.2_0ch="双声道"

9
plugins/decklink/decklink-device-instance.cpp
View file

@ -6,6 +6,7 @@
#include <util/platform.h>
#include <util/threading.h>
#include <util/util_uint64.h>
#include <sstream>
#include <algorithm>
@ -90,8 +91,8 @@ void DeckLinkDeviceInstance::HandleAudioPacket(
if (decklink && !static_cast<DeckLinkInput *>(decklink)->buffering) {
currentPacket.timestamp = os_gettime_ns();
currentPacket.timestamp -=
(uint64_t)frameCount * 1000000000ULL /
(uint64_t)currentPacket.samples_per_sec;
util_mul_div64(frameCount, 1000000000ULL,
currentPacket.samples_per_sec);
}
int maxdevicechannel = device->GetMaxChannel();
@ -113,7 +114,7 @@ void DeckLinkDeviceInstance::HandleAudioPacket(
}
nextAudioTS = timestamp +
((uint64_t)frameCount * 1000000000ULL / 48000ULL) + 1;
util_mul_div64(frameCount, 1000000000ULL, 48000ULL) + 1;
obs_source_output_audio(
static_cast<DeckLinkInput *>(decklink)->GetSource(),
@ -191,7 +192,7 @@ void DeckLinkDeviceInstance::SetupVideoFormat(DeckLinkDeviceMode *mode_)
#ifdef LOG_SETUP_VIDEO_FORMAT
LOG(LOG_INFO, "Setup video format: %s, %s, %s",
pixelFormat == bmdFormat8BitYUV ? "YUV" : "RGB",
activeColorSpace == VIDEO_CS_709 ? "BT.709" : "BT.601",
activeColorSpace == VIDEO_CS_601 ? "BT.601" : "BT.709",
colorRange == VIDEO_RANGE_FULL ? "full" : "limited");
#endif
}

8
plugins/decklink/decklink-output.cpp
View file

@ -9,6 +9,7 @@
#include "decklink-devices.hpp"
#include "../../libobs/media-io/video-scaler.h"
#include "../../libobs/util/util_uint64.h"
static void decklink_output_destroy(void *data)
{
@ -127,8 +128,8 @@ static bool prepare_audio(DeckLinkOutput *decklink,
*output = *frame;
if (frame->timestamp < decklink->start_timestamp) {
uint64_t duration = (uint64_t)frame->frames * 1000000000 /
(uint64_t)decklink->audio_samplerate;
uint64_t duration = util_mul_div64(frame->frames, 1000000000ULL,
decklink->audio_samplerate);
uint64_t end_ts = frame->timestamp + duration;
uint64_t cutoff;
@ -138,7 +139,8 @@ static bool prepare_audio(DeckLinkOutput *decklink,
cutoff = decklink->start_timestamp - frame->timestamp;
output->timestamp += cutoff;
cutoff *= (uint64_t)decklink->audio_samplerate / 1000000000;
cutoff = util_mul_div64(cutoff, decklink->audio_samplerate,
1000000000ULL);
for (size_t i = 0; i < decklink->audio_planes; i++)
output->data[i] +=

1
plugins/decklink/linux/CMakeLists.txt
View file

@ -63,5 +63,6 @@ add_library(linux-decklink MODULE
target_link_libraries(linux-decklink
libobs
)
set_target_properties(linux-decklink PROPERTIES FOLDER "plugins")
install_obs_plugin_with_data(linux-decklink ../data)

1
plugins/decklink/mac/CMakeLists.txt
View file

@ -74,5 +74,6 @@ add_library(mac-decklink MODULE
target_link_libraries(mac-decklink
libobs
${COREFOUNDATION})
set_target_properties(mac-decklink PROPERTIES FOLDER "plugins")
install_obs_plugin_with_data(mac-decklink ../data)

1
plugins/decklink/win/CMakeLists.txt
View file

@ -67,5 +67,6 @@ add_library(win-decklink MODULE
target_link_libraries(win-decklink
libobs)
set_target_properties(win-decklink PROPERTIES FOLDER "plugins")
install_obs_plugin_with_data(win-decklink ../data)