Ticket #7555: 7555-win32_spdif.2.patch

libs/libmyth/audiooutputwin.cpp

@@ -138 +138 @@
     }
 }
 
+vector<int> AudioOutputWin::GetSupportedRates(void)
+{
+    // We use WAVE_MAPPER to find a compatible device,
+    // so just return a set of standard rates
+    const int srates[] = { 11025, 22050, 44100, 48000 };
+    vector<int> rates(srates, srates + sizeof(srates) / sizeof(int) );
+    return rates;
+}
+
 bool AudioOutputWin::OpenDevice(void)
 {
     CloseDevice();
@@ -145 +154 @@
     SetBlocking(true);
     fragment_size = (AUDIOOUTPUT_TELEPHONY == source) ? 320 : 6144;
     soundcard_buffer_size = kPacketCnt * fragment_size;
+    m_UseSPDIF = audio_passthru || audio_enc;
 
     WAVEFORMATEXTENSIBLE wf;
     wf.Format.wFormatTag =

libs/libmyth/audiooutputwin.h

@@ -23 +23 @@
     virtual void WriteAudio(unsigned char *aubuf, int size);
     virtual int  GetSpaceOnSoundcard(void) const;
     virtual int  GetBufferedOnSoundcard(void) const;
+    vector<int> GetSupportedRates(void);
 
   protected:
     AudioOutputWinPrivate *m_priv;

libs/libmyth/audiooutputdx.cpp

@@ -280 +280 @@
     }
 }
 
+vector<int> AudioOutputDX::GetSupportedRates(void)
+{
+    const int srates[] = { 8000, 11025, 16000, 22050, 32000, 44100, 48000 };
+    vector<int> rates(srates, srates + sizeof(srates) / sizeof(int) );
+    DSCAPS devcaps;
+    devcaps.dwSize = sizeof(DSCAPS);
+
+    if ((!m_priv->dsobject || !m_priv->dsound_dll) ||
+        FAILED(IDirectSound_GetCaps(m_priv->dsobject, &devcaps)) )
+    {
+        rates.clear();
+        return rates;
+    }
+
+    VERBOSE(VB_AUDIO, QString(LOC + "GetCaps sample rate min: %1 max: %2")
+                .arg(devcaps.dwMinSecondarySampleRate)
+                .arg(devcaps.dwMaxSecondarySampleRate));
+
+    vector<int>::iterator it = rates.begin();
+    while (it != rates.end())
+    {
+        if(((DWORD)*it < devcaps.dwMinSecondarySampleRate) ||
+           ((DWORD)*it > devcaps.dwMaxSecondarySampleRate) )
+            it = rates.erase(it);
+        else
+            it++;
+    }
+
+    return rates;
+}
+
 bool AudioOutputDX::OpenDevice(void)
 {
     WAVEFORMATEXTENSIBLE wf;
@@ -299 +330 @@
         fragment_size *= 2;
     soundcard_buffer_size = kFramesNum * fragment_size;
     audio_bytes_per_sample = audio_bits / 8 * audio_channels;
+    m_UseSPDIF = audio_passthru || audio_enc;
     if (m_UseSPDIF && (audio_channels != 2))
     {
         Error("SPDIF passthru requires 2 channel data");

libs/libmyth/audiooutputdx.h

@@ -23 +23 @@
     virtual void Pause(bool pause);
     virtual int GetSpaceOnSoundcard(void) const;
     virtual int GetBufferedOnSoundcard(void) const;    
+    vector<int> GetSupportedRates(void);
 
   protected:
     AudioOutputDXPrivate    *m_priv;