- input-source selection works now (with bass or portaudio with portmixer)

- audio-effects (DSP) interface for audio-playback plus a simple voice removal example (does not sound that good)
- FFMpeg support for BASS
- audio-clock for FFMpeg for GetPosition and synchronisation
- more compatible seeking in FFMpeg
- clean termination of the audio interfaces/streams (especially ffmpeg)
- Audio output device enumeration (selection will be added later to the sounds option screen)
- display of threshold and volume in the record-options screen
- threshold and volume can be changed with the 'T' (threshold) and '+'/'-' (source volume) keys
- added a FadeIn() method to the IAudioPlayback interface
- some minor changes to the audio classes/screens
- new base-class for audio-playback classes (used by bass, portaudio and sdl)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1078 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 219 insertions, 29 deletions

diff --git a/Game/Code/Classes/UAudioPlayback_Portaudio.pas b/Game/Code/Classes/UAudioPlayback_Portaudio.pas
index 431fbd43..2c52c41e 100644
--- a/Game/Code/Classes/UAudioPlayback_Portaudio.pas
+++ b/Game/Code/Classes/UAudioPlayback_Portaudio.pas
@@ -28,12 +28,21 @@ type
   TAudioPlayback_Portaudio = class(TAudioPlayback_SoftMixer)

     private

       paStream:  PPaStream;

+      AudioCore: TAudioCore_Portaudio;

+      function OpenDevice(deviceIndex: TPaDeviceIndex): boolean;

+      function EnumDevices(): boolean;

     protected

       function InitializeAudioPlaybackEngine(): boolean; override;

       function StartAudioPlaybackEngine(): boolean;      override;

       procedure StopAudioPlaybackEngine();               override;

+      function FinalizeAudioPlaybackEngine(): boolean;   override;

     public

-      function  GetName: String;                         override;

+      function GetName: String;                          override;

+  end;

+

+  TPortaudioOutputDevice = class(TAudioOutputDevice)

+    private

+      PaDeviceIndex:  TPaDeviceIndex;

   end;

 

 var

@@ -58,50 +67,39 @@ begin
   result := 'Portaudio_Playback';

 end;

 

-function TAudioPlayback_Portaudio.InitializeAudioPlaybackEngine(): boolean;

+function TAudioPlayback_Portaudio.OpenDevice(deviceIndex: TPaDeviceIndex): boolean;

 var

-  paApiIndex      : TPaHostApiIndex;

-  paApiInfo       : PPaHostApiInfo;

-  paOutParams     : TPaStreamParameters;

-  paOutDevice     : TPaDeviceIndex;

-  paOutDeviceInfo : PPaDeviceInfo;

-  err             : TPaError;

-  sampleRate      : double;

+  deviceInfo : PPaDeviceInfo;

+  sampleRate : double;

+  outParams  : TPaStreamParameters;

+  err        : TPaError;

 begin

-  result := false;

+  Result := false;

 

-  Pa_Initialize();

+  deviceInfo := Pa_GetDeviceInfo(deviceIndex);

 

-  paApiIndex := TAudioCore_Portaudio.GetPreferredApiIndex();

-  if(paApiIndex = -1) then

-  begin

-    Log.LogError('No working Audio-API found', 'TAudioPlayback_Portaudio.InitializeAudioPlaybackEngine');

-    Exit;

-  end;

-

-  paApiInfo := Pa_GetHostApiInfo(paApiIndex);

-  paOutDevice     := paApiInfo^.defaultOutputDevice;

-  paOutDeviceInfo := Pa_GetDeviceInfo(paOutDevice);

+  Log.LogInfo('Audio-Output Device: ' + deviceInfo^.name, 'TAudioPlayback_Portaudio.OpenDevice');

 

-  sampleRate := paOutDeviceInfo^.defaultSampleRate;

+  sampleRate := deviceInfo^.defaultSampleRate;

 

-  with paOutParams do begin

-    device := paOutDevice;

+  with outParams do

+  begin

+    device := deviceIndex;

     channelCount := 2;

     sampleFormat := paInt16;

-    suggestedLatency := paOutDeviceInfo^.defaultLowOutputLatency;

+    suggestedLatency := deviceInfo^.defaultLowOutputLatency;

     hostApiSpecificStreamInfo := nil;

   end;

 

   // check souncard and adjust sample-rate

-  if not TAudioCore_Portaudio.TestDevice(nil, @paOutParams, sampleRate) then

+  if not AudioCore.TestDevice(nil, @outParams, sampleRate) then

   begin

     Log.LogStatus('TestDevice failed!', 'TAudioPlayback_Portaudio.OpenDevice');

     exit;

   end;

 

   // open output stream

-  err := Pa_OpenStream(paStream, nil, @paOutParams, sampleRate,

+  err := Pa_OpenStream(paStream, nil, @outParams, sampleRate,

           paFramesPerBufferUnspecified,

           paNoFlag, @PortaudioAudioCallback, Self);

   if(err <> paNoError) then

@@ -112,12 +110,199 @@ begin
   end;

   

   FormatInfo := TAudioFormatInfo.Create(

-    paOutParams.channelCount,

+    outParams.channelCount,

     sampleRate,

     asfS16 // FIXME: is paInt16 system-dependant or -independant?

   );

 

-  Log.LogStatus('Opened audio device', 'UAudioPlayback_Portaudio');

+  Result := true;

+end;

+

+function TAudioPlayback_Portaudio.EnumDevices(): boolean;

+var

+  i:           integer;

+  paApiIndex:  TPaHostApiIndex;

+  paApiInfo:   PPaHostApiInfo;

+  deviceName:  string;

+  deviceIndex: TPaDeviceIndex;

+  deviceInfo:  PPaDeviceInfo;

+  channelCnt:  integer;

+  SC:          integer; // soundcard

+  err:         TPaError;

+  errMsg:      string;

+  paDevice:    TPortaudioOutputDevice;

+  inputParams: TPaStreamParameters;

+  stream:      PPaStream;

+  streamInfo:  PPaStreamInfo;

+  sampleRate:  double;

+  latency:     TPaTime;

+  cbPolls: integer;

+  cbWorks: boolean;

+begin

+  Result := false;

+(*

+  // choose the best available Audio-API

+  paApiIndex := AudioCore.GetPreferredApiIndex();

+  if(paApiIndex = -1) then

+  begin

+    Log.LogError('No working Audio-API found', 'TAudioPlayback_Portaudio.EnumDevices');

+    Exit;

+  end;

+

+  paApiInfo := Pa_GetHostApiInfo(paApiIndex);

+

+  SC := 0;

+

+  // init array-size to max. output-devices count

+  SetLength(OutputDeviceList, paApiInfo^.deviceCount);

+  for i:= 0 to High(OutputDeviceList) do

+  begin

+    // convert API-specific device-index to global index

+    deviceIndex := Pa_HostApiDeviceIndexToDeviceIndex(paApiIndex, i);

+    deviceInfo := Pa_GetDeviceInfo(deviceIndex);

+

+    channelCnt := deviceInfo^.maxOutputChannels;

+

+    // current device is no output device -> skip

+    if (channelCnt <= 0) then

+      continue;

+

+    // portaudio returns a channel-count of 128 for some devices

+    // (e.g. the "default"-device), so we have to detect those

+    // fantasy channel counts.

+    if (channelCnt > 8) then

+      channelCnt := 2;

+

+    paDevice := TPortaudioOutputDevice.Create();

+    OutputDeviceList[SC] := paDevice;

+

+    // retrieve device-name

+    deviceName := deviceInfo^.name;

+    paDevice.Name := deviceName;

+    paDevice.PaDeviceIndex := deviceIndex;

+

+    if (deviceInfo^.defaultSampleRate > 0) then

+      sampleRate := deviceInfo^.defaultSampleRate

+    else

+      sampleRate := 44100;

+

+    // on vista and xp the defaultLowInputLatency may be set to 0 but it works.

+    // TODO: correct too low latencies (what is a too low latency, maybe < 10ms?)

+    latency := deviceInfo^.defaultLowInputLatency;

+

+    // setup desired input parameters

+    // TODO: retry with input-latency set to 20ms (defaultLowInputLatency might

+    //       not be set correctly in OSS)

+    with inputParams do

+    begin

+      device := deviceIndex;

+      channelCount := channelCnt;

+      sampleFormat := paInt16;

+      suggestedLatency := latency;

+      hostApiSpecificStreamInfo := nil;

+    end;

+

+    // check if mic-callback works (might not be called on some devices)

+    if (not TAudioCore_Portaudio.TestDevice(@inputParams, nil, sampleRate)) then

+    begin

+      // ignore device if callback did not work

+      Log.LogError('Device "'+paDevice.Name+'" does not respond',

+                   'TAudioInput_Portaudio.InitializeRecord');

+      paDevice.Free();

+      continue;

+    end;

+

+    // open device for further info

+    err := Pa_OpenStream(stream, @inputParams, nil, sampleRate,

+        paFramesPerBufferUnspecified, paNoFlag, @MicrophoneTestCallback, nil);

+    if(err <> paNoError) then

+    begin

+      // unable to open device -> skip

+      errMsg := Pa_GetErrorText(err);

+      Log.LogError('Device error: "'+ deviceName +'" ('+ errMsg +')',

+                   'TAudioInput_Portaudio.InitializeRecord');

+      paDevice.Free();

+      continue;

+    end;

+

+    // adjust sample-rate (might be changed by portaudio)

+    streamInfo := Pa_GetStreamInfo(stream);

+    if (streamInfo <> nil) then

+    begin

+      if (sampleRate <> streamInfo^.sampleRate) then

+      begin

+        Log.LogStatus('Portaudio changed Samplerate from ' + FloatToStr(sampleRate) +

+            ' to ' + FloatToStr(streamInfo^.sampleRate),

+            'TAudioInput_Portaudio.InitializeRecord');

+        sampleRate := streamInfo^.sampleRate;

+      end;

+    end;

+    

+    // create audio-format info and resize capture-buffer array

+    paDevice.AudioFormat := TAudioFormatInfo.Create(

+        channelCnt,

+        sampleRate,

+        asfS16

+    );

+    SetLength(paDevice.CaptureChannel, paDevice.AudioFormat.Channels);

+

+    Log.LogStatus('InputDevice "'+paDevice.Name+'"@' +

+        IntToStr(paDevice.AudioFormat.Channels)+'x'+

+        FloatToStr(paDevice.AudioFormat.SampleRate)+'Hz ('+

+        FloatTostr(inputParams.suggestedLatency)+'sec)' ,

+        'Portaudio.InitializeRecord');

+

+    // close test-stream

+    Pa_CloseStream(stream);

+

+    Inc(SC);

+  end;

+

+  // adjust size to actual input-device count

+  SetLength(OutputDeviceList, SC);

+

+  Log.LogStatus('#Output-Devices: ' + inttostr(SC), 'Portaudio');

+

+  Result := true;

+  *)

+end;

+

+function TAudioPlayback_Portaudio.InitializeAudioPlaybackEngine(): boolean;

+var

+  paApiIndex      : TPaHostApiIndex;

+  paApiInfo       : PPaHostApiInfo;

+  paOutDevice     : TPaDeviceIndex;

+  err: TPaError;

+begin

+  result := false;

+

+  AudioCore := TAudioCore_Portaudio.GetInstance();

+

+  // initialize portaudio

+  err := Pa_Initialize();

+  if(err <> paNoError) then

+  begin

+    Log.LogError(Pa_GetErrorText(err), 'TAudioInput_Portaudio.InitializeRecord');

+    Exit;

+  end;

+

+  paApiIndex := AudioCore.GetPreferredApiIndex();

+  if(paApiIndex = -1) then

+  begin

+    Log.LogError('No working Audio-API found', 'TAudioPlayback_Portaudio.InitializeAudioPlaybackEngine');

+    Exit;

+  end;

+

+  EnumDevices();

+

+  paApiInfo := Pa_GetHostApiInfo(paApiIndex);

+  Log.LogInfo('Audio-Output API-Type: ' + paApiInfo^.name, 'TAudioPlayback_Portaudio.OpenDevice');

+

+  paOutDevice := paApiInfo^.defaultOutputDevice;

+  if (not OpenDevice(paOutDevice)) then

+  begin

+    Exit;

+  end;

 

   result := true;

 end;

@@ -147,6 +332,11 @@ begin
     Pa_StopStream(paStream);

 end;

 

+function TAudioPlayback_Portaudio.FinalizeAudioPlaybackEngine(): boolean;

+begin

+  Pa_Terminate();

+  Result := true;

+end;

 

 

 initialization