Changeset 529

Timestamp:

Jul 27, 2010, 6:28:57 PM (15 years ago)

Author:

David Azarewicz

Message:

driver xrun changes

Location:

OCO/trunk

Files:

• drv16/ioctl.cpp (modified) (1 diff)
• drv16/wavestrm.cpp (modified) (10 diffs)
• install/control.scr (modified) (2 diffs)
• uniaud.inc (modified) (2 diffs)

OCO/trunk/drv16/ioctl.cpp

@@ -227 +227 @@
          p->ulSamplingRate = HZ_44100;
          //
-         rprintf(("IACapability: Error support"));
+         //dprintf(("IACapability: Error support"));
          prp->usStatus |= RPERR;
       }

OCO/trunk/drv16/wavestrm.cpp

@@ -160 +160 @@
 ULONG WAVESTREAM::_vUnderrunStart(void)
 {
-        if (ulStreamState == STREAM_STREAMING) return 0;
+//      if (ulStreamState == STREAM_STREAMING) return 0;
         rprintf(("Underrun-start"));
-        PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
+//      PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
 //      if(pahw->ConfigDev(StreamId, &_configinfo, (pTemp) ? pTemp->ulBuffsz : 0) == FALSE) {
 //              rprintf(("WS::Write: ConfigDev failed"));
@@ -198 +198 @@
         ULONG ulStatus;
 
-        //dprintf(("WS:AddBuffers First=%d, SampleSize=%lx", sFirst, _configinfo.ulSampleSize));
 
         if (sAddBuffersInProcess) {
@@ -223 +222 @@
                 }
                 ulSpace &= (~(_configinfo.ulSampleSize - 1));
-#if 1
-                /* DAZ testing -- underrun detection */
+#if 0
+                /* DAZ testing -- driver error and stopped */
                 if (ulSpace == 0) {
-                        OSS16_WaveGetStatus(StreamId, &ulStatus);
-                        rprintf(("WS::ABS ulSpace=0 state=%lx u32status=%lx", ulStreamState, ulStatus));
-
-                        _vUnderrunStop("WS:ABS");
+                        rprintf(("WS:AddBuffers Space=0"));
                         _vUnderrunStart();
 
@@ -376 +372 @@
 void DBGCALLCONV WAVESTREAM::Process(void)
 {
-        PSTREAMBUFFER pTemp;
-        ULONG   ulBytes;
-        ULONG ulDAZ;
-
-        //dprintf(("WAVESTREAM::Process Start"));
-
-        // get the stream position. if we get a bad rc or the position is 0
-        // then we bail out. Hopefully this will be better next time.
-        // GetPostiion returns the adjusted hw pointer from the ALSA status ioctl
-        // This is really a running total of bytes consumed by the hardware.
-        // DAZ - Note that this is a 32 bit counter and will wrap at sometime. ALSA
-        // attempts to wrap this counter intelligently. I haven't determined what
-        // effect, if any, the wrapping of this counter will have playing a stream.
-        if(pahw->GetPosition(StreamId, &_configinfo, &ulBytes) == FALSE)
-        {
-                //dprintf(("Error No bytes processed"));
-                DebugInt3();
-                return;
-        }
-        _ulBytesProcessed = ulBytes;
-
         switch (ulStreamType & STREAM_WRITE)
         {
                 case STREAM_WRITE:
+                        {
+                        PSTREAMBUFFER pTemp;
+                        ULONG   ulBytes;
+
+                        // get the stream position. if we get a bad rc or the position is 0
+                        // then we bail out. Hopefully this will be better next time.
+                        // GetPostiion returns the adjusted hw pointer from the ALSA status ioctl
+                        // This is really a running total of bytes consumed by the hardware.
+                        // DAZ - Note that this is a 32 bit counter and will wrap at sometime. ALSA
+                        // attempts to wrap this counter intelligently. I haven't determined what
+                        // effect, if any, the wrapping of this counter will have playing a stream.
+                        if(pahw->GetPosition(StreamId, &_configinfo, &ulBytes) == FALSE) {
+                                //dprintf(("Error No bytes processed"));
+                                DebugInt3();
+                                return;
+                        }
+                        _ulBytesProcessed = ulBytes;
+
                         if(!qhInProcess.IsElements() && !qhDone.IsElements()) {
+                                //Application underrun
                                 _vUnderrunStop("WS:Process");
                                 break;
@@ -422 +416 @@
                         }
                         break;
+                        }
                 case STREAM_READ:
+                        {
+                        ULONG ulDAZ;
+
                         ulDAZ = 0;
                         while(_vReadAudioBuf()) {
-                                if (ulDAZ++ > 20) { /* temporary hack to prevent hangs when uniaud32 stops (overruns) */
+                                if (ulDAZ++ > 20) { /* temporary hack to prevent hangs if uniaud32 stops */
                                         rprintf(("WS::Process Read DAZ Break"));
                                         break;
@@ -431 +429 @@
                         }
                         break;
+                        }
                 default:
                         break;
@@ -436 +435 @@
 
         ProcessEvents();
-        //dprintf(("WAVESTREAM::Process End"));
 }
 //******************************************************************************
@@ -444 +442 @@
 #pragma on (unreferenced)
 {
-        PSTREAMBUFFER pStreamBuf = new STREAMBUFFER(uLength, pbuf);
+        PSTREAMBUFFER pStreamBuf;
+        pStreamBuf = new STREAMBUFFER(uLength, pbuf);
 
         return Write(pStreamBuf);
@@ -453 +452 @@
 {
 
-#if 1
-        ULONG ulStatus;
-
-        ulStatus = 0;
-        if (OSS16_WaveGetStatus(StreamId, &ulStatus) != OSSERR_SUCCESS) ulStatus = SNDRV_PCM_STATE_XRUN;
-        //dprintf(("WS::Write: status=%lx", ulStatus));
-        if (ulStatus == SNDRV_PCM_STATE_XRUN) {
-                rprintf(("WS::Write: Xrun detect"));
-                _vUnderrunStop("WS:Write");
-                fUnderrun = TRUE;
-        }
-#endif
         qhInProcess.PushOnTail((PQUEUEELEMENT)pStreamBuf);
         if (fUnderrun) {
@@ -686 +673 @@
         pahw->Stop(StreamId);
 
-#if 0
-        /* DAZ test code begin */
-        if (pahw->GetPosition(StreamId, &_configinfo, &ulEndPos2) == FALSE) ulEndPos2 = 0;
-        if (ulEndPos2 != ulEndPos) {
-                dprintf(("WS::PauseStream %lx!=%lx", ulEndPos, ulEndPos2));
-                if (ulEndPos2) ulEndPos = ulEndPos2;
-        }
-        /* DAZ test code end */
-#endif
-
         ulStreamState = STREAM_PAUSED;
 

OCO/trunk/install/control.scr

@@ -25 +25 @@
 ssgroup=0
 ssname="mmbase"
-ssversion="1.9.3-SVNr526"
+ssversion="1.9.4-SVNr529"
 sstermdll="ITERM.DLL"
 sstermdllentry="ITermEntry"
@@ -43 +43 @@
 ssgroup=17
 ssname="OS/2 Universal Audio: Wave"
-ssversion="1.9.3-SVNr526"
+ssversion="1.9.4-SVNr529"
 sssize=680
 ssdll="genin.dll"

OCO/trunk/uniaud.inc

@@ -7 +7 @@
 # BUILDVERSION must be 3 parts, and only numbers like 5.44.108
 # It is best that 2nd number is always 2 digits, eg at least 10
-BUILDVERSION = 1.9.3
+BUILDVERSION = 1.9.4
 
 # Fixpack version
@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVNr526
+FIXPACK = SVNr529
 
 # ALSA BUILD VERSION