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

1
plugins/coreaudio-encoder/CMakeLists.txt
View file

@ -37,5 +37,6 @@ add_library(coreaudio-encoder MODULE
target_link_libraries(coreaudio-encoder
libobs
${coreaudio-encoder_LIBS})
set_target_properties(coreaudio-encoder PROPERTIES FOLDER "plugins")
install_obs_plugin_with_data(coreaudio-encoder data)

3
plugins/coreaudio-encoder/data/locale/ba-RU.ini Normal file
View file

@ -0,0 +1,3 @@
Bitrate="Битрейт"
AllowHEAAC="HE-AAC рөхсәт итеү"

4
plugins/coreaudio-encoder/data/locale/de-DE.ini
View file

@ -1,6 +1,6 @@
CoreAudioAAC="CoreAudio‐AAC‐Kodierer"
CoreAudioAAC="CoreAudio‐AAC‐Encoder"
Bitrate="Bitrate"
AllowHEAAC="HE‐AAC erlauben"
OutputSamplerate="Ausgabe‐Sample‐Rate"
UseInputSampleRate="Eingabe‐Sample‐Rate (OBS) verwenden (Listet möglicherweise nicht unterstützte Bitraten auf.)"
UseInputSampleRate="Eingabe‐Sample‐Rate (OBS) verwenden (listet möglicherweise nicht unterstützte Bitraten auf)"

6
plugins/coreaudio-encoder/data/locale/en-GB.ini Normal file
View file

@ -0,0 +1,6 @@
CoreAudioAAC="CoreAudio AAC encoder"
Bitrate="Bitrate"
AllowHEAAC="Allow HE-AAC"
OutputSamplerate="Output Sample Rate"
UseInputSampleRate="Use Input (OBS) Sample Rate (may list unsupported bitrates)"

1
plugins/coreaudio-encoder/data/locale/fa-IR.ini
View file

@ -2,5 +2,4 @@ CoreAudioAAC="هسته صدا کدگذاری AAC"
Bitrate="نرخ بیت"
AllowHEAAC="اجازه AAC با راندمان بالا"
OutputSamplerate="نرخ نمونه خروجی"
UseInputSampleRate="استفاده از ورودی (OBS) نرخ نمونه (ممکن است بیت ریت های پشتیبانی نشده را لیست کند)ممکن است بیت ریت های پشتیبانی نشده را لیست کند"

2
plugins/coreaudio-encoder/data/locale/he-IL.ini
View file

@ -1,3 +1,5 @@
CoreAudioAAC="מקודד AAC של CoreAudio"
Bitrate="קצב ביטים"
AllowHEAAC="אפשר HE-ACC"
OutputSamplerate="קצב דגימת שמע"

6
plugins/coreaudio-encoder/data/locale/id-ID.ini Normal file
View file

@ -0,0 +1,6 @@
CoreAudioAAC="Enkoder AAC CoreAudio"
Bitrate="Bitrate"
AllowHEAAC="Izinkan HE-AAC"
OutputSamplerate="Sample Rate Output"
UseInputSampleRate="Gunakan Sample Rate Input (OBS) (dapat mencantumkan bitrate yang tidak didukung)"

4
plugins/coreaudio-encoder/data/locale/ro-RO.ini
View file

@ -1,6 +1,6 @@
CoreAudioAAC="Codificator AAC CoreAudio"
Bitrate="Rată de biți"
AllowHEAAC="Permite HE-AAC"
OutputSamplerate="Rată de eșantionare a ieșirii"
UseInputSampleRate="Folosește rata de eșantionare (OBS) ca intrare (poate lista rate de biți neacceptate)"
OutputSamplerate="Rată de eșantionare a outpului"
UseInputSampleRate="Folosește rata de eșantionare a intrării OBS (poate lista rate de biți nesuportate)"

2
plugins/coreaudio-encoder/data/locale/uk-UA.ini
View file

@ -1,4 +1,4 @@
CoreAudioAAC="CoreAudio AAC енкодер"
CoreAudioAAC="Кодувальник CoreAudio AAC"
Bitrate="Бітрейт"
AllowHEAAC="Дозволити HE-AAC"
OutputSamplerate="Частота дискретизації виводу"

22
plugins/coreaudio-encoder/encoder.cpp
View file

@ -597,14 +597,34 @@ static void *aac_create(obs_data_t *settings, obs_encoder_t *encoder)
/*
* Fix channel map differences between CoreAudio AAC, FFmpeg, Wav
* New channel mappings below assume 2.1, 4.1, 5.1, 7.1 resp.
* New channel mappings below assume 2.1, 4.0, 4.1, 5.1, 7.1 resp.
*/
if (ca->channels == 3) {
SInt32 channelMap3[3] = {2, 0, 1};
AudioConverterSetProperty(ca->converter,
kAudioConverterChannelMap,
sizeof(channelMap3), channelMap3);
} else if (ca->channels == 4) {
/*
* For four channels coreaudio encoder has default channel "quad"
* instead of 4.0. So explicitly set channel layout to
* kAudioChannelLayoutTag_MPEG_4_0_B = (116L << 16) | 4.
*/
AudioChannelLayout inAcl = {0};
inAcl.mChannelLayoutTag = (116L << 16) | 4;
AudioConverterSetProperty(ca->converter,
kAudioConverterInputChannelLayout,
sizeof(inAcl), &inAcl);
AudioConverterSetProperty(ca->converter,
kAudioConverterOutputChannelLayout,
sizeof(inAcl), &inAcl);
SInt32 channelMap4[4] = {2, 0, 1, 3};
AudioConverterSetProperty(ca->converter,
kAudioConverterChannelMap,
sizeof(channelMap4), channelMap4);
} else if (ca->channels == 5) {
SInt32 channelMap5[5] = {2, 0, 1, 3, 4};
AudioConverterSetProperty(ca->converter,

18
plugins/coreaudio-encoder/windows-imports.h
View file

@ -61,6 +61,24 @@ struct AudioStreamPacketDescription {
};
typedef struct AudioStreamPacketDescription AudioStreamPacketDescription;
typedef UInt32 AudioChannelLabel;
typedef UInt32 AudioChannelLayoutTag;
struct AudioChannelDescription {
AudioChannelLabel mChannelLabel;
UInt32 mChannelFlags;
float mCoordinates[3];
};
typedef struct AudioChannelDescription AudioChannelDescription;
struct AudioChannelLayout {
AudioChannelLayoutTag mChannelLayoutTag;
UInt32 mChannelBitmap;
UInt32 mNumberChannelDescriptions;
AudioChannelDescription mChannelDescriptions[kVariableLengthArray];
};
typedef struct AudioChannelLayout AudioChannelLayout;
typedef OSStatus (*AudioConverterComplexInputDataProc)(
AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets,
AudioBufferList *ioData,