1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-09 14:16:28 +01:00

Update portaudio to upstream r1966

------------------------------------------------------------------------
r1966 | philburk | 2016-02-15 11:06:54 -0600 (Mon, 15 Feb 2016) | 3 lines

Update docs for building on Linux

------------------------------------------------------------------------
r1965 | philburk | 2016-01-04 11:22:56 -0600 (Mon, 04 Jan 2016) | 6 lines

Files needed for compiling on El Capitan.

These files were autogenerated using autoreconf based
on changes from the previous commit.

------------------------------------------------------------------------
r1964 | philburk | 2016-01-04 11:22:00 -0600 (Mon, 04 Jan 2016) | 9 lines

Add support for 10.11 SDK so PortAudio can compile on Mac.

Also allow deprecated APIs until we can remove them.

Note that this commit only includes the source files that were changed.
The next commit will include the files that are generated by autoreconf.
So look at this commit to see what really changed.

------------------------------------------------------------------------
r1963 | dmitrykos | 2015-10-21 09:25:07 -0500 (Wed, 21 Oct 2015) | 1 line

wasapi: correction to the previous commit
------------------------------------------------------------------------
r1962 | dmitrykos | 2015-10-20 11:02:39 -0500 (Tue, 20 Oct 2015) | 1 line

wasapi: workaround to avoid PaWasapi_Initialize() failure when enumerating devices and device fails to report min/default periods with IAudioClient::GetDevicePeriod(): ignore error and assign WASAPI common known period values for min/default
------------------------------------------------------------------------
r1961 | dmitrykos | 2015-10-19 06:03:31 -0500 (Mon, 19 Oct 2015) | 1 line

wasapi: support for setting the WASAPI's AudioClientProperties options via PaWasapiStreamInfo struct (__IAudioClient2_INTERFACE_DEFINED__ must be defined by Windows SDK (for Windows 8 and up) to have effect from these new options, otherwise it will be noop)
------------------------------------------------------------------------
r1960 | rbencina | 2015-09-06 08:17:05 -0500 (Sun, 06 Sep 2015) | 1 line

update doxygen main page to reference developer guidelines and implementation style guidelines on the Wiki
------------------------------------------------------------------------
r1959 | rbencina | 2015-09-06 07:43:06 -0500 (Sun, 06 Sep 2015) | 1 line

checkfiledocs.py: blacklist mingw-include from doc check
------------------------------------------------------------------------
r1958 | rbencina | 2015-09-06 07:37:38 -0500 (Sun, 06 Sep 2015) | 1 line

checkfiledocs.py: only check source code under src and include
------------------------------------------------------------------------
r1957 | rbencina | 2015-09-06 05:55:01 -0500 (Sun, 06 Sep 2015) | 1 line

Issue #234 fixed typo in configure and configure.in affecting mingw builds. Rename: pa_win_wdmks_util.o --> pa_win_wdmks_utils.o
------------------------------------------------------------------------
r1956 | rbencina | 2015-09-06 05:26:16 -0500 (Sun, 06 Sep 2015) | 1 line

removed bindings/java from doxygen generated documentation
------------------------------------------------------------------------
r1954 | gineera | 2015-04-19 13:48:38 -0500 (Sun, 19 Apr 2015) | 1 line

Pa_process: Fix output channel adaption by not skipping the conversion when the host and user number-of-channels are not equal.  Reported by Leif Asbrink when using an envy24 soundcard on Linux at it's native Int32 format with 1 or 2 channels.  Corresponding fix for input already in r1913.
------------------------------------------------------------------------
r1953 | philburk | 2015-04-09 23:00:09 -0500 (Thu, 09 Apr 2015) | 4 lines

Add Pa_GetVersionInfo()
Add scripts to update pa_svnrevision.h

------------------------------------------------------------------------
r1952 | philburk | 2015-03-12 11:23:11 -0500 (Thu, 12 Mar 2015) | 3 lines

Test adding a second file with SVN keywords.

------------------------------------------------------------------------
r1951 | philburk | 2015-03-12 11:21:04 -0500 (Thu, 12 Mar 2015) | 3 lines

Used propset to enable SVN keywords on test file.

------------------------------------------------------------------------
r1950 | philburk | 2015-03-12 11:16:44 -0500 (Thu, 12 Mar 2015) | 3 lines

Experiment with the SVN version keywords.

------------------------------------------------------------------------
r1949 | philburk | 2015-03-03 11:28:15 -0600 (Tue, 03 Mar 2015) | 4 lines

Add version numbering with major.minor.subminor format.
Bump version to 19.5.0

------------------------------------------------------------------------
r1948 | rbencina | 2015-01-21 00:52:11 -0600 (Wed, 21 Jan 2015) | 1 line

pa/wmme: avoid potential (but highly unlikely) overflow in buffer size in call to WideCharToMultiByte if a device name length exceeds INT_MAX. should also fix compiler warning about size_t to int assignment.
------------------------------------------------------------------------
r1947 | rbencina | 2015-01-21 00:32:29 -0600 (Wed, 21 Jan 2015) | 1 line

removed declaration of unused variable
------------------------------------------------------------------------
r1946 | rbencina | 2015-01-21 00:30:53 -0600 (Wed, 21 Jan 2015) | 1 line

fixed compiler warning: conversion from 'double' to 'float', possible loss of data
------------------------------------------------------------------------
r1945 | rbencina | 2015-01-21 00:24:32 -0600 (Wed, 21 Jan 2015) | 1 line

disabled deprecated API warning for GetVersionEx in dsound, wmme and wdmks host APIs.
------------------------------------------------------------------------
r1944 | rbencina | 2015-01-20 23:35:39 -0600 (Tue, 20 Jan 2015) | 1 line

Removed MSVC dependence on ksguid.lib from src/os/win/pa_win_wdmks_utils.c (ksguid.lib is no longer in Platform SDK 8.0). Always use static instances of GUIDs like the GCC builds do. Removed ksguid.lib from MSVC project file. The following symbols are no longer used: PA_WDMKS_NO_KSGUID_LIB, PAWIN_WDMKS_NO_KSGUID_LIB; removed them from CMakeLists.txt and the MSVC project file.
------------------------------------------------------------------------
r1943 | rbencina | 2015-01-19 23:10:17 -0600 (Mon, 19 Jan 2015) | 1 line

cpp binding: make operator == and != const. thanks to Riot for this patch. ticket #230
------------------------------------------------------------------------
r1934 | rbencina | 2014-11-04 19:03:57 -0600 (Tue, 04 Nov 2014) | 1 line

PA/CoreAudio: fixed copy-pasto: last host error was being associated with paInDevelopment host api not paCoreAudio
------------------------------------------------------------------------
r1933 | robiwan | 2014-08-28 00:59:40 -0500 (Thu, 28 Aug 2014) | 1 line

Added more debugging info in wdmks/pa_win_wdmks.c
------------------------------------------------------------------------
r1932 | robiwan | 2014-08-15 01:35:32 -0500 (Fri, 15 Aug 2014) | 1 line

Committing Lelands patch for WDM-KS, should take care of some of the problems referenced here http://music.columbia.edu/pipermail/portaudio/2014-August/016246.html
------------------------------------------------------------------------
r1930 | bejayoharen | 2014-06-28 11:28:17 -0500 (Sat, 28 Jun 2014) | 1 line

olivier's device name patch for os x
------------------------------------------------------------------------
r1928 | rbencina | 2014-04-11 00:46:40 -0500 (Fri, 11 Apr 2014) | 1 line

pa_win_ds.c converted tabs to spaces (only a small amount of code was incorrectly using tabs).
------------------------------------------------------------------------
r1927 | rbencina | 2014-04-11 00:44:50 -0500 (Fri, 11 Apr 2014) | 1 line

DirectSound: correctly output device names as UTF-8 when compiled with UNICODE defined. Note that this patch may not be correct if UNICODE is not defined. Patch from Tobias Erichsen. See ticket #224 for details.
------------------------------------------------------------------------
r1926 | rbencina | 2014-04-11 00:31:13 -0500 (Fri, 11 Apr 2014) | 1 line

pa_win_wmme.c: converted tabs to spaces (just a few sections)
------------------------------------------------------------------------
r1925 | rbencina | 2014-04-11 00:25:48 -0500 (Fri, 11 Apr 2014) | 1 line

WMME: correctly convert device names to UTF-8, see ticket #224. Thanks to Tobias Erichsen for the patch.
------------------------------------------------------------------------
r1924 | robiwan | 2014-04-09 09:27:21 -0500 (Wed, 09 Apr 2014) | 4 lines

CMake: Added PA_WDMKS_NO_KSGUID_LIB to WDMKS and solution folders
WDMKS: Support for default device (see caveat for input devices though in ScanDeviceInfos)
       Added possibility to set channel mask

------------------------------------------------------------------------
r1920 | bejayoharen | 2014-02-05 12:43:31 -0600 (Wed, 05 Feb 2014) | 1 line

Clarified safety of operations in callback (doc)
------------------------------------------------------------------------
r1919 | rbencina | 2014-01-30 05:46:42 -0600 (Thu, 30 Jan 2014) | 1 line

updated Windows+ASIO build tutorial: Building Portaudio for Windows with ASIO support using MSVC. The tutorial was out of date and contained a number of errors that broke the build process.
------------------------------------------------------------------------
r1918 | rbencina | 2014-01-30 04:12:02 -0600 (Thu, 30 Jan 2014) | 1 line

tweaked Windows build tutorial: Building PortAudio for Windows using Microsoft Visual Studio - various improvements to clarity of text. Fixed broken ASIO SDK URL.
------------------------------------------------------------------------
r1916 | philburk | 2014-01-16 21:45:15 -0600 (Thu, 16 Jan 2014) | 6 lines

Add stub to pa_trace.c to eliminate warning.

"make install" was causing a warning if PA_TRACE_REALTIME_EVENTS
was not defined.

------------------------------------------------------------------------
r1915 | philburk | 2014-01-16 11:51:26 -0600 (Thu, 16 Jan 2014) | 5 lines

[tests] Add EOL to patest_mono.c

Build was failing on Mac because of the missing end-of-line.

------------------------------------------------------------------------
r1914 | philburk | 2014-01-16 11:49:33 -0600 (Thu, 16 Jan 2014) | 6 lines

[macosx] Add support for SDK 10.8 and 10.9.

This was required to fix a broken build caused
by not having SDK 10.7 or earlier.

------------------------------------------------------------------------
r1913 | gineera | 2013-11-18 05:42:27 -0600 (Mon, 18 Nov 2013) | 1 line

Pa_process: Fix input channel adaption by not skipping the input conversion when the host and user number-of-channels are not equal.  The bug manifested when recording mono from a stereo-only device (eg with Alsa hw: devices on some sound-cards), and was reported by the Mixxx team -see https://bugs.launchpad.net/mixxx/+bug/900364.  (In the long-term, some refactoring may be preferable.)  Also fixed copy-paste typos in comments.
------------------------------------------------------------------------
r1912 | gineera | 2013-11-15 06:27:07 -0600 (Fri, 15 Nov 2013) | 1 line

Jack: Add a port-type filter expression to calls to jack_get_ports() so that only audio ports are listed (removing eg Midi etc) as reported by 'sqweek'.
------------------------------------------------------------------------
r1911 | gineera | 2013-10-17 07:44:09 -0500 (Thu, 17 Oct 2013) | 1 line

Alsa: Revise the use of the environment variable 'PA_ALSA_PLUGHW' so it correctly influences the Device-List and the capabilities reported.  Also rename a mis-leading variable and add one additional DEBUG line.
This commit is contained in:
Leland Lucius
2016-03-08 00:52:13 -06:00
parent aee12f5755
commit 126aec1824
73 changed files with 20988 additions and 3123 deletions

View File

@@ -69,8 +69,8 @@ typedef enum PaWasapiFlags
method can only provide 15-20ms latency. */
paWinWasapiPolling = (1 << 3),
/* forces custom thread priority setting. must be used if PaWasapiStreamInfo::threadPriority
is set to custom value. */
/* forces custom thread priority setting, must be used if PaWasapiStreamInfo::threadPriority
is set to a custom value */
paWinWasapiThreadPriority = (1 << 4)
}
PaWasapiFlags;
@@ -91,7 +91,7 @@ typedef void (*PaWasapiHostProcessorCallback) (void *inputBuffer, long inputFra
void *outputBuffer, long outputFrames,
void *userData);
/* Device role */
/* Device role. */
typedef enum PaWasapiDeviceRole
{
eRoleRemoteNetworkDevice = 0,
@@ -109,7 +109,7 @@ typedef enum PaWasapiDeviceRole
PaWasapiDeviceRole;
/* Jack connection type */
/* Jack connection type. */
typedef enum PaWasapiJackConnectionType
{
eJackConnTypeUnknown,
@@ -128,10 +128,10 @@ typedef enum PaWasapiJackConnectionType
PaWasapiJackConnectionType;
/* Jack geometric location */
/* Jack geometric location. */
typedef enum PaWasapiJackGeoLocation
{
eJackGeoLocUnk = 0,
eJackGeoLocUnk = 0,
eJackGeoLocRear = 0x1, /* matches EPcxGeoLocation::eGeoLocRear */
eJackGeoLocFront,
eJackGeoLocLeft,
@@ -151,7 +151,7 @@ typedef enum PaWasapiJackGeoLocation
PaWasapiJackGeoLocation;
/* Jack general location */
/* Jack general location. */
typedef enum PaWasapiJackGenLocation
{
eJackGenLocPrimaryBox = 0,
@@ -162,7 +162,7 @@ typedef enum PaWasapiJackGenLocation
PaWasapiJackGenLocation;
/* Jack's type of port */
/* Jack's type of port. */
typedef enum PaWasapiJackPortConnection
{
eJackPortConnJack = 0,
@@ -173,7 +173,7 @@ typedef enum PaWasapiJackPortConnection
PaWasapiJackPortConnection;
/* Thread priority */
/* Thread priority. */
typedef enum PaWasapiThreadPriority
{
eThreadPriorityNone = 0,
@@ -202,6 +202,42 @@ typedef struct PaWasapiJackDescription
PaWasapiJackDescription;
/* Stream category.
Note:
- values are equal to WASAPI AUDIO_STREAM_CATEGORY enum
- supported since Windows 8.0, noop on earler versions
- values 1,2 are deprecated on Windows 10 and not included into enumeration
*/
typedef enum PaWasapiStreamCategory
{
eAudioCategoryOther = 0,
eAudioCategoryCommunications = 3,
eAudioCategoryAlerts = 4,
eAudioCategorySoundEffects = 5,
eAudioCategoryGameEffects = 6,
eAudioCategoryGameMedia = 7,
eAudioCategoryGameChat = 8,
eAudioCategorySpeech = 9,
eAudioCategoryMovie = 10,
eAudioCategoryMedia = 11
}
PaWasapiStreamCategory;
/* Stream option.
Note:
- values are equal to WASAPI AUDCLNT_STREAMOPTIONS enum
- supported since Windows 8.1, noop on earler versions
*/
typedef enum PaWasapiStreamOption
{
eStreamOptionNone = 0, //!< default
eStreamOptionRaw = 1, //!< bypass WASAPI Audio Engine DSP effects, supported since Windows 8.1
eStreamOptionMatchFormat = 2 //!< force WASAPI Audio Engine into a stream format, supported since Windows 10
}
PaWasapiStreamOption;
/* Stream descriptor. */
typedef struct PaWasapiStreamInfo
{
@@ -235,6 +271,12 @@ typedef struct PaWasapiStreamInfo
to setup thread priority.
*/
PaWasapiThreadPriority threadPriority;
/* Stream category. */
PaWasapiStreamCategory streamCategory;
/* Stream option. */
PaWasapiStreamOption streamOption;
}
PaWasapiStreamInfo;
@@ -263,25 +305,6 @@ int PaWasapi_GetDeviceDefaultFormat( void *pFormat, unsigned int nFormatSize, Pa
int/*PaWasapiDeviceRole*/ PaWasapi_GetDeviceRole( PaDeviceIndex nDevice );
/** Returns device loopback indicator.
@param nDevice device index.
@return 0 = Not loopback, 1 = loopback, < 0 = PaErrorCode
if PortAudio is not initialized or an error is encountered.
*/
int PaWasapi_IsLoopback( PaDeviceIndex nDevice );
/** Returns Windows device ID.
@param nDevice device index.
@return 0 = Not loopback, 1 = loopback, < 0 = PaErrorCode
if PortAudio is not initialized or an error is encountered.
*/
const wchar_t *PaWasapi_GetInputDeviceID( PaStream* s );
const wchar_t *PaWasapi_GetOutputDeviceID( PaStream* s );
/** Boost thread priority of calling thread (MMCSS). Use it for Blocking Interface only for thread
which makes calls to Pa_WriteStream/Pa_ReadStream.
@@ -322,7 +345,7 @@ PaError PaWasapi_GetFramesPerHostBuffer( PaStream *pStream, unsigned int *nInput
/** Get number of jacks associated with a WASAPI device. Use this method to determine if
there are any jacks associated with the provided WASAPI device. Not all audio devices
will support this capability. This is valid for both input and output devices.
will support this capability. This is valid for both input and output devices.
@param nDevice device index.
@param jcount Number of jacks is returned in this variable
@return Error code indicating success or failure
@@ -333,9 +356,9 @@ PaError PaWasapi_GetJackCount(PaDeviceIndex nDevice, int *jcount);
/** Get the jack description associated with a WASAPI device and jack number
Before this function is called, use PaWasapi_GetJackCount to determine the
number of jacks associated with device. If jcount is greater than zero, then
each jack from 0 to jcount can be queried with this function to get the jack
description.
number of jacks associated with device. If jcount is greater than zero, then
each jack from 0 to jcount can be queried with this function to get the jack
description.
@param nDevice device index.
@param jindex Which jack to return information
@param KSJACK_DESCRIPTION This structure filled in on success.
@@ -366,7 +389,7 @@ PaError PaWasapi_GetJackDescription(PaDeviceIndex nDevice, int jindex, PaWasapiJ
This is the most powerful WASAPI implementation which provides glitch-free
audio at around 3ms latency in Exclusive mode. Lowest possible latency for this mode is
3 ms for HD Audio class audio chips. For the Shared mode latency can not be
lower than 20 ms.
lower than 20 ms.
2) Poll-Driven:
Polling is another 2-nd method to operate with WASAPI. It is less efficient than Event-Driven