Changeset 79223aaeafe7ef625f08551700a6ae4d2a26e8b0

Timestamp:

03/02/08 18:22:11 (6 months ago)

Author:

André Weber <WeberAndre@gmx.de>

git-committer:

André Weber <WeberAndre@gmx.de> 1204478531 +0100

git-parent:

[ced125da0699eb348462270926a6802288800433]

git-author:

André Weber <WeberAndre@gmx.de> 1204478531 +0100

Message:

Bugfix for #492: Audio output on Windows useing SPDIF for AC3 / DTS
But its still very time critical, because paout gets sometimes empty
so that aout_OutputNextBuffer(..) doesn't deliver new audiobuffers,
sometimes it happens - that these buffers arrive very late for output.
Reasons: -changed CPU load, (extra running application, also fast forward
seeking and and jumping may lead to this situation.)

Enhancement #897: added an option to let the user choose is prefered audio device. (needs restart of VLC to get applied)

Files:

• modules/audio_output/waveout.c (modified) (37 diffs)

modules/audio_output/waveout.c

@@ -32 +32 @@
-#include <vlc/vlc.h>
-#include <vlc_aout.h>
+#include <vlc_charset.h>
-
-#include <windows.h>
@@ -121 +122 @@
-/* local functions */
-static void Probe        ( aout_instance_t * );
-
-
+
+
+
+
-static int PlayWaveOut   ( aout_instance_t *, HWAVEOUT, WAVEHDR *,
-
+, vlc_bool_t
-
-static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD, DWORD, DWORD );
@@ -132 +135 @@
-static int VolumeGet( aout_instance_t *, audio_volume_t * );
-static int VolumeSet( aout_instance_t *, audio_volume_t );
+
+static int WaveOutClearDoneBuffers(aout_sys_t *p_sys);
+
+static int ReloadWaveoutDevices( vlc_object_t *, char const *,
+                                vlc_value_t, vlc_value_t, void * );
+static uint32_t findDeviceID(char *);
+
+static const char psz_device_name_fmt[] = "%s ($%x,$%x)";
+
+static const char *ppsz_adev[] = { "wavemapper", };
+static const char *ppsz_adev_text[] = { N_("Microsoft Soundmapper") };
+
+
-
-/*****************************************************************************
@@ -140 +156 @@
-    "The option allows you to enable or disable the high-quality float32 " \
-    "audio output mode (which is not well supported by some soundcards)." )
+#define DEVICE_TEXT N_("Select Audio Device")
+#define DEVICE_LONG N_("Select special Audio device, or let windows "\
+                       "decide (default), change needs VLC restart "\
+                       "to apply.")
+#define DEFAULT_AUDIO_DEVICE N_("Default Audio Device")
-
-vlc_module_begin();
@@ -148 +169 @@
-    set_subcategory( SUBCAT_AUDIO_AOUT );
-    add_bool( "waveout-float32", 1, 0, FLOAT_TEXT, FLOAT_LONGTEXT, VLC_TRUE );
+
+    add_string( "waveout-dev", "wavemapper", NULL,
+                 DEVICE_TEXT, DEVICE_LONG, VLC_FALSE );
+       change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices );
+       change_need_restart();
+       change_action_add( ReloadWaveoutDevices, N_("Refresh list") );
+
+
-    set_callbacks( Open, Close );
-vlc_module_end();
@@ -159 +188 @@
-struct aout_sys_t
-{
+    uint32_t i_wave_device_id;               /* ID of selected output device */
+
-    HWAVEOUT h_waveout;                        /* handle to waveout instance */
-
@@ -167 +198 @@
-    notification_thread_t *p_notif;                      /* WaveOutThread id */
-    HANDLE event;
+    HANDLE new_buffer_event;
+
+    // rental from alsa.c to synchronize startup of audiothread
+    int b_playing;                                         /* playing status */
+    mtime_t start_date;
+
+    int i_repeat_counter;
-
-    int i_buffer_size;
@@ -215 +253 @@
-    p_aout->b_die = VLC_FALSE;
-
+
+    /*
+     initialize/update Device selection List
+    */
+    ReloadWaveoutDevices( p_this, "waveout-dev", val, val, NULL);
+
+
+    /*
+      check for configured audio device!
+    */
+    char *psz_waveout_dev = var_CreateGetString( p_aout, "waveout-dev");
+
+    p_aout->output.p_sys->i_wave_device_id =
+         findDeviceID( psz_waveout_dev );
+
+    if(p_aout->output.p_sys->i_wave_device_id == WAVE_MAPPER)
+    {
+       if(psz_waveout_dev &&
+          stricmp(psz_waveout_dev,"wavemapper"))
+       {
+           msg_Warn( p_aout, "configured audio device '%s' not available, "\
+                         "use default instead", psz_waveout_dev );
+       }
+    }
+    if(psz_waveout_dev) free( psz_waveout_dev );
+
+
+    WAVEOUTCAPS waveoutcaps;
+    if(waveOutGetDevCaps( p_aout->output.p_sys->i_wave_device_id,
+                          &waveoutcaps,
+                          sizeof(WAVEOUTCAPS)) == MMSYSERR_NOERROR)
+    {
+      /* log debug some infos about driver, to know who to blame
+         if it doesn't work */
+        msg_Dbg( p_aout, "Drivername: %s", waveoutcaps.szPname);
+        msg_Dbg( p_aout, "Driver Version: %d.%d",
+                          (waveoutcaps.vDriverVersion>>8)&255,
+                          waveoutcaps.vDriverVersion & 255);
+        msg_Dbg( p_aout, "Manufacturer identifier: 0x%x", waveoutcaps.wMid );
+        msg_Dbg( p_aout, "Product identifier: 0x%x", waveoutcaps.wPid );
+    }
+
+
+
-    if( var_Type( p_aout, "audio-device" ) == 0 )
-    {
@@ -223 +305 @@
-    {
-        /* Probe() has failed. */
+        var_Destroy( p_aout, "waveout-device");
-        free( p_aout->output.p_sys );
-        return VLC_EGENERIC;
-    }
-
-    var_Create( p_aout, "waveout-float32", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
-    /* Open the device */
@@ -234 +316 @@
-        p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
-
-
+
+
+
-                         p_aout->output.output.i_physical_channels,
-                         aout_FormatNbChannels( &p_aout->output.output ),
@@ -281 +365 @@
-        }
-
-
+
+
+
-                            p_aout->output.output.i_physical_channels,
-                            aout_FormatNbChannels( &p_aout->output.output ),
@@ -328 +414 @@
-        return 1;
-    }
+    p_aout->output.p_sys->i_repeat_counter = 0;
+
-
-    /* Zero the buffer. WinCE doesn't have calloc(). */
@@ -338 +426 @@
-    p_aout->output.p_sys->p_notif->p_aout = p_aout;
-    p_aout->output.p_sys->event = CreateEvent( NULL, FALSE, FALSE, NULL );
+    p_aout->output.p_sys->new_buffer_event = CreateEvent( NULL, FALSE, FALSE, NULL );
+
+    /* define startpoint of playback on first call to play()
+      like alsa does (instead of playing a blank sample) */
+    p_aout->output.p_sys->b_playing = 0;
+    p_aout->output.p_sys->start_date = 0;
+
-
-    /* Then launch the notification thread */
-    if( vlc_thread_create( p_aout->output.p_sys->p_notif,
-                           "waveOut Notification Thread", WaveOutThread,
-HIGHES
+OUTPU
-    {
-        msg_Err( p_aout, "cannot create WaveOutThread" );
@@ -354 +449 @@
-        p_aout->output.p_sys->waveheader[i].dwUser = 0;
-    }
-    PlayWaveOut( p_aout, p_aout->output.p_sys->h_waveout,
-                 &p_aout->output.p_sys->waveheader[0], NULL );
-
-    return 0;
@@ -379 +472 @@
-    if( p_aout->output.output.i_physical_channels == i_physical_channels )
-    {
-
+
+
+
-                            i_physical_channels, 6,
-                            p_aout->output.output.i_rate, VLC_TRUE )
@@ -385 +480 @@
-        {
-            val.i_int = AOUT_VAR_5_1;
-
+(char *)
-            var_Change( p_aout, "audio-device",
-                        VLC_VAR_ADDCHOICE, &val, &text );
@@ -398 +493 @@
-        == i_physical_channels )
-    {
-
+
+
+
-                            i_physical_channels, 4,
-                            p_aout->output.output.i_rate, VLC_TRUE )
@@ -404 +501 @@
-        {
-            val.i_int = AOUT_VAR_2F2R;
-
+(char *)
-            var_Change( p_aout, "audio-device",
-                        VLC_VAR_ADDCHOICE, &val, &text );
@@ -413 +510 @@
-    /* Test for stereo support */
-    i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
-
+
+
+
-                        i_physical_channels, 2,
-                        p_aout->output.output.i_rate, VLC_TRUE )
@@ -419 +518 @@
-    {
-        val.i_int = AOUT_VAR_STEREO;
-
+(char *)
-        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
-        msg_Dbg( p_aout, "device supports 2 channels" );
@@ -426 +525 @@
-    /* Test for mono support */
-    i_physical_channels = AOUT_CHAN_CENTER;
-
+
+
+
-                        i_physical_channels, 1,
-                        p_aout->output.output.i_rate, VLC_TRUE )
@@ -432 +533 @@
-    {
-        val.i_int = AOUT_VAR_MONO;
-
+(char *)
-        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
-        msg_Dbg( p_aout, "device supports 1 channel" );
@@ -440 +541 @@
-    if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
-    {
-
+
+
+
-                         p_aout->output.output.i_physical_channels,
-                         aout_FormatNbChannels( &p_aout->output.output ),
@@ -448 +551 @@
-            msg_Dbg( p_aout, "device supports A/52 over S/PDIF" );
-            val.i_int = AOUT_VAR_SPDIF;
-
+(char *)
-            var_Change( p_aout, "audio-device",
-                        VLC_VAR_ADDCHOICE, &val, &text );
@@ -478 +581 @@
-static void Play( aout_instance_t *_p_aout )
-{
+    if( !_p_aout->output.p_sys->b_playing )
+    {
+        _p_aout->output.p_sys->b_playing = 1;
+
+        /* get the playing date of the first aout buffer */
+        _p_aout->output.p_sys->start_date =
+            aout_FifoFirstDate( _p_aout, &_p_aout->output.fifo );
+
+        msg_Dbg( _p_aout, "Wakeup sleeping output thread.");
+
+        /* wake up the audio output thread */
+        SetEvent( _p_aout->output.p_sys->event );
+    } else {
+        SetEvent( _p_aout->output.p_sys->new_buffer_event );
+    }
-}
-
@@ -491 +609 @@
-    vlc_object_kill( p_aout );
-
-
-
-
+
-    SetEvent( p_sys->event );
+    SetEvent( p_sys->new_buffer_event );
+
-    vlc_thread_join( p_sys->p_notif );
-    vlc_object_release( p_sys->p_notif );
+
+    /*
+      kill the real output then - when the feed thread
+      is surely terminated!
+      old code could be too early in case that "feeding"
+      was running on termination
+
+      at this point now its sure, that there will be no new
+      data send to the driver, and we can cancel the last
+      running playbuffers
+    */
+    MMRESULT result = waveOutReset( p_sys->h_waveout );
+    if(result != MMSYSERR_NOERROR)
+    {
+       msg_Err( p_aout, "waveOutReset failed 0x%x", result );
+       /*
+        now we must wait, that all buffers are played
+        because cancel doesn't work in this case...
+       */
+       if(result == MMSYSERR_NOTSUPPORTED)
+       {
+           /*
+             clear currently played (done) buffers,
+             if returnvalue > 0 (means some buffer still playing)
+             wait for the driver event callback that one buffer
+             is finished with playing, and check again
+             the timeout of 5000ms is just, an emergency exit
+             of this loop, to avoid deadlock in case of other
+             (currently not known bugs, problems, errors cases?)
+           */
+           while(
+                 (WaveOutClearDoneBuffers( p_sys ) > 0)
+                 &&
+                 (WaitForSingleObject( p_sys->event, 5000) == WAIT_OBJECT_0)
+                )
+           {
+                 msg_Dbg( p_aout, "Wait for waveout device...");
+           }
+       }
+    } else {
+        WaveOutClearDoneBuffers( p_sys );
+    }
+
+    /* now we can Close the device */
+    if( waveOutClose( p_sys->h_waveout ) != MMSYSERR_NOERROR )
+    {
+        msg_Err( p_aout, "waveOutClose failed" );
+    }
+
+    /*
+      because so long, the waveout device is playing, the callback
+      could occur and need the events
+    */
-    CloseHandle( p_sys->event );
-
-
-
-
-
-
+
-
-    free( p_sys->p_silence_buffer );
@@ -512 +678 @@
- * OpenWaveOut: open the waveout sound device
- ****************************************************************************/
-
+uint32_t i_device_id, 
-                        int i_channels, int i_nb_channels, int i_rate,
-                        vlc_bool_t b_probe )
@@ -579 +745 @@
-    }
-
+    if(!b_probe) {
+        msg_Dbg( p_aout, "OpenWaveDevice-ID: %u", i_device_id);
+        msg_Dbg( p_aout,"waveformat.Format.cbSize          = %d",
+                 waveformat.Format.cbSize);
+        msg_Dbg( p_aout,"waveformat.Format.wFormatTag      = %u",
+                 waveformat.Format.wFormatTag);
+        msg_Dbg( p_aout,"waveformat.Format.nChannels       = %u",
+                 waveformat.Format.nChannels);
+        msg_Dbg( p_aout,"waveformat.Format.nSamplesPerSec  = %d",
+                 (int)waveformat.Format.nSamplesPerSec);
+        msg_Dbg( p_aout,"waveformat.Format.nAvgBytesPerSec = %u",
+                 (int)waveformat.Format.nAvgBytesPerSec);
+        msg_Dbg( p_aout,"waveformat.Format.nBlockAlign     = %d",
+                 waveformat.Format.nBlockAlign);
+        msg_Dbg( p_aout,"waveformat.Format.wBitsPerSample  = %d",
+                 waveformat.Format.wBitsPerSample);
+        msg_Dbg( p_aout,"waveformat.Samples.wValidBitsPerSample = %d",
+                 waveformat.Samples.wValidBitsPerSample);
+        msg_Dbg( p_aout,"waveformat.Samples.wSamplesPerBlock = %d",
+                 waveformat.Samples.wSamplesPerBlock);
+        msg_Dbg( p_aout,"waveformat.dwChannelMask          = %lu",
+                 waveformat.dwChannelMask);
+    }
+
-    /* Open the device */
-WAVE_MAPPER
+i_device_id
-                          (WAVEFORMATEX *)&waveformat,
-                          (DWORD_PTR)WaveOutCallback, (DWORD_PTR)p_aout,
@@ -619 +809 @@
- * OpenWaveOutPCM: open a PCM waveout sound device
- ****************************************************************************/
-
+uint32_t i_device_id, 
-                           int i_channels, int i_nb_channels, int i_rate,
-                           vlc_bool_t b_probe )
-{
-
-
-
-
-
+
+
+
-                                   i_channels, i_nb_channels, i_rate, b_probe )
-        != VLC_SUCCESS )
-    {
-
+i_device_id, 
-                          i_channels, i_nb_channels, i_rate, b_probe )
-             != VLC_SUCCESS )
@@ -654 +842 @@
- *****************************************************************************/
-static int PlayWaveOut( aout_instance_t *p_aout, HWAVEOUT h_waveout,
-
+
+
-{
-    MMRESULT result;
@@ -660 +849 @@
-    /* Prepare the buffer */
-    if( p_buffer != NULL )
+    {
-        p_waveheader->lpData = p_buffer->p_buffer;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Use silence buffer instead */
+        if(p_aout->output.p_sys->i_repeat_counter)
+        {
+           p_aout->output.p_sys->i_repeat_counter--;
+           if(!p_aout->output.p_sys->i_repeat_counter)
+           {
+               p_aout->p_libvlc->pf_memset( p_aout->output.p_sys->p_silence_buffer,
+                                            0x00,
+                                            p_aout->output.p_sys->i_buffer_size
+                                          );
+           }
+        }
-        p_waveheader->lpData = p_aout->output.p_sys->p_silence_buffer;
+    }
-
-    p_waveheader->dwUser = p_buffer ? (DWORD_PTR)p_buffer : (DWORD_PTR)1;
@@ -712 +927 @@
-
-    /* Don't wake up the thread too much */
- FRAMES_NUM / 
+= FRAMES_NUM/
-        SetEvent( p_aout->output.p_sys->event );
+}
+
+
+/****************************************************************************
+ * WaveOutClearDoneBuffers: Clear all done marked buffers, and free aout_bufer
+ ****************************************************************************
+ * return value is the number of still playing buffers in the queue
+ ****************************************************************************/
+static int WaveOutClearDoneBuffers(aout_sys_t *p_sys)
+{
+    WAVEHDR *p_waveheader = p_sys->waveheader;
+    int i_queued_frames = 0;
+
+    for( int i = 0; i < FRAMES_NUM; i++ )
+    {
+        if( (p_waveheader[i].dwFlags & WHDR_DONE) &&
+            p_waveheader[i].dwUser )
+        {
+            aout_buffer_t *p_buffer =
+                    (aout_buffer_t *)(p_waveheader[i].dwUser);
+            /* Unprepare and free the buffers which has just been played */
+            waveOutUnprepareHeader( p_sys->h_waveout, &p_waveheader[i],
+                                    sizeof(WAVEHDR) );
+
+            if( p_waveheader[i].dwUser != 1 )
+                aout_BufferFree( p_buffer );
+
+            p_waveheader[i].dwUser = 0;
+        }
+
+        /* Check if frame buf is available */
+        if( !(p_waveheader[i].dwFlags & WHDR_DONE) )
+        {
+            i_queued_frames++;
+        }
+    }
+    return i_queued_frames;
-}
-
@@ -731 +983 @@
-    int i, i_queued_frames;
-    vlc_bool_t b_sleek;
+    mtime_t next_date;
+    uint32_t i_buffer_length = 64;
-
-    /* We don't want any resampling when using S/PDIF */
-    b_sleek = p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i');
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Cleanup and find out the current latency */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        if( p_aout->b_die ) return;
@@ -773 +1022 @@
-            if( p_waveheader[i].dwFlags & WHDR_DONE )
-            {
+                // next_date = mdate() + 1000000 * i_queued_frames /
+                //  p_aout->output.output.i_rate * p_aout->output.i_nb_samples;
+
+                // the realtime has got our back-site:) to come in sync
+                if(next_date < mdate())
+                   next_date = mdate();
+
+
-                /* Take into account the latency */
-                p_buffer = aout_OutputNextBuffer( p_aout,
-
-
+
-                    b_sleek );
+
+                if(!p_buffer)
+                {
+#if 0
+                    msg_Dbg( p_aout, "aout_OutputNextBuffer no buffer "\
+                                      "got next_date=%d ms, "\
+                                      "%d frames to play, "\
+                                      "starving? %d",(int)(next_date/(mtime_t)1000),
+                                                     i_queued_frames,
+                                                     p_aout->output.b_starving);
+#endif
+                    if(p_aout->output.b_starving)
+                    {
+                        // means we are too early to request a new buffer?
+                        waveout_warn("waiting...")
+                        next_date = aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
+                        mwait( next_date - AOUT_PTS_TOLERANCE/4 );
+                        next_date = mdate();
+                        p_buffer = aout_OutputNextBuffer( p_aout,
+                                     next_date,
+                                     b_sleek
+                                   );
+                    }
+                }
-
-                if( !p_buffer && i_queued_frames )
@@ -783 +1063 @@
-                    /* We aren't late so no need to play a blank sample */
-                    break;
+                }
+
+                if( p_buffer )
+                {
+                    mtime_t buffer_length = (p_buffer->end_date
+                                             - p_buffer->start_date);
+                    next_date = next_date + buffer_length;
+                    i_buffer_length = buffer_length/1000;
-                }
-
@@ -796 +1084 @@
-
-                PlayWaveOut( p_aout, p_sys->h_waveout,
-
+, b_sleek
-
-                i_queued_frames++;
-            }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -840 +1149 @@
-    return 0;
-}
+
+
+/*
+  reload the configuration drop down list, of the Audio Devices
+*/
+static int ReloadWaveoutDevices( vlc_object_t *p_this, char const *psz_name,
+                                 vlc_value_t newval, vlc_value_t oldval, void *data )
+{
+    int i;
+
+    module_config_t *p_item = config_FindConfig( p_this, psz_name );
+    if( !p_item ) return VLC_SUCCESS;
+
+    /* Clear-up the current list */
+    if( p_item->i_list )
+    {
+        /* Keep the first entry */
+        for( i = 1; i < p_item->i_list; i++ )
+        {
+            free((char *)(p_item->ppsz_list[i]) );
+            free((char *)(p_item->ppsz_list_text[i]) );
+        }
+        /* TODO: Remove when no more needed */
+        p_item->ppsz_list[i] = NULL;
+        p_item->ppsz_list_text[i] = NULL;
+    }
+    p_item->i_list = 1;
+
+    int wave_devices = waveOutGetNumDevs();
+
+    p_item->ppsz_list =
+        (char **)realloc( p_item->ppsz_list,
+                          (wave_devices+2) * sizeof(char *) );
+    p_item->ppsz_list_text =
+        (char **)realloc( p_item->ppsz_list_text,
+                          (wave_devices+2) * sizeof(char *) );
+
+    WAVEOUTCAPS caps;
+    char sz_dev_name[MAXPNAMELEN+32];
+    int j=1;
+    for(int i=0; i<wave_devices; i++)
+    {
+        if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
+           == MMSYSERR_NOERROR)
+        {
+          sprintf(sz_dev_name,psz_device_name_fmt,caps.szPname,
+                                               caps.wMid,
+                                               caps.wPid
+                                              );
+          p_item->ppsz_list[j] = strdup( sz_dev_name );
+          p_item->ppsz_list_text[j] = FromLocaleDup( sz_dev_name );
+          p_item->i_list++;
+          j++;
+        }
+
+    }
+    p_item->ppsz_list[j] = NULL;
+    p_item->ppsz_list_text[j] = NULL;
+
+    /* Signal change to the interface */
+    p_item->b_dirty = VLC_TRUE;
+
+    return VLC_SUCCESS;
+}
+
+/*
+  convert devicename to device ID for output
+  if device not found return WAVE_MAPPER, so let
+  windows decide which prefered audio device
+  should be used.
+*/
+static uint32_t findDeviceID(char *psz_device_name)
+{
+    if(!psz_device_name)
+       return WAVE_MAPPER;
+
+    uint32_t wave_devices = waveOutGetNumDevs();
+    WAVEOUTCAPS caps;
+    char sz_dev_name[MAXPNAMELEN+32];
+    for(uint32_t i=0; i<wave_devices; i++)
+    {
+        if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
+           == MMSYSERR_NOERROR)
+        {
+            sprintf(sz_dev_name,psz_device_name_fmt,caps.szPname,
+                                               caps.wMid,
+                                               caps.wPid
+                                              );
+            if(!stricmp(sz_dev_name,psz_device_name))
+               return i;
+        }
+    }
+
+    return WAVE_MAPPER;
+}