Changeset 468 for OCO/trunk/drv16/waveplay.cpp

Timestamp:

Nov 4, 2009, 4:21:24 PM (16 years ago)

Author:

pasha

Message:

Rebuild buffers supply, fix DDCMD_WRITE with len=0 in WAVE chain, remove/add debug output, change DebugInt3 for debug/nondebug version, move unused code to unused directore

File:

• OCO/trunk/drv16/waveplay.cpp (modified) (26 diffs)

OCO/trunk/drv16/waveplay.cpp

@@ -79 +79 @@
             dprintf(("OSS16_WaveOpen failed!!"));
 #endif
-//            DevHelp_Beep(1000, 100);
             DebugInt3();
 //            StreamId = 0;
@@ -108 +107 @@
 {
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::Close stream: %lx, %lx, os: %lx\n", StreamId, waveOpened,open_strategy));
+    dprintf(("WAVEPLAY::Close stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
 #endif
 #if 0 // fixme to be gone?
@@ -120 +119 @@
         force_closed = 0;
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx\n", StreamId, waveOpened,open_strategy));
+        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
 #endif
         return TRUE;
@@ -141 +140 @@
                 open_strategy = 0UL;
 #ifdef DEBUG
-                dprintf(("OSS16_WAVECLOSE: Success\n"));
+                dprintf(("OSS16_WAVECLOSE: Success"));
 #endif /* DEBUG */
                 return TRUE;
             } else
 #ifdef DEBUG
-                dprintf(("OSS16_WAVECLOSE: Error\n"));
+                dprintf(("OSS16_WAVECLOSE: Error"));
 #endif /* DEBUG */
                 return FALSE;
@@ -166 +165 @@
     int            samplesize;
     ULONG          ulPCMConsumeRate;
-    int rc;
+    USHORT         rc;
 
 
@@ -195 +194 @@
 #endif
 
-    if(ulFirstBufSize == 0) {
+    if(ulFirstBufSize == 0)
+    {
         ulFirstBufSize = pConfigInfo->ulFragsize; //no conversion required (see below)
-        if(ulFirstBufSize == 0) {
+        if (ulFirstBufSize == 0) 
+        {
             DebugInt3();
             ulFirstBufSize = 8192; //should never happen!
@@ -205 +206 @@
         }
     }
-    else {
+    else 
+    {
         //convert size of first buffer
         ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
@@ -212 +214 @@
 #endif /* DEBUG */
     }
-
     //Must call this method (i.e. resets sample rate conversion position)
     WAVEAUDIO::ConfigDev(StreamId, pConfigInfo, ulFirstBufSize);
@@ -225 +226 @@
 #endif /* DEBUG */
 
-    fragsize = ulPCMConsumeRate/64; //start with 64 irqs/sec
+    fragsize = ulPCMConsumeRate/64; //start with 64 irqs/sec   2756
 
     //if the buffer is smaller than our predefined fragmentsize (*2), then correct it
@@ -232 +233 @@
     //There's nothing we can do about it as the fragment size can't be changed
     //while the stream is playing.
-    ULONG minimumsize = ulFirstBufSize/2;
+    ULONG minimumsize = ulFirstBufSize/2;  //650
     if(minimumsize && minimumsize < fragsize)
     {
-        while(minimumsize < fragsize) fragsize = fragsize / 2;
-
+        while(minimumsize < fragsize) fragsize = fragsize / 2; //
+ 
             if(fragsize < ulPCMConsumeRate/256)
             {//lower limit; don't accept extremely small buffers
@@ -257 +258 @@
     hwparam.ulNumChannels   = pConfigInfo->ulHwNumChannels;
     hwparam.ulDataType      = QueryOSSDataFormat(OPERATION_PLAY, pConfigInfo->ulDataType, pConfigInfo->ulHwBitsPerSample);
-    rc = (int)OSS16_WaveSetFormat(StreamId, &hwparam);
+    rc = (USHORT)OSS16_WaveSetFormat(StreamId, &hwparam);
 #ifdef DEBUG
         dprintf(("WAVEPLAY:ConfigDev:OSS16_WaveSetFormat . rc = %d",rc));
@@ -267 +268 @@
 #endif
     if( rc != OSSERR_SUCCESS) {
-//        DevHelp_Beep(500, 100);
+        dprintf(("WAVEPLAY:ConfigDev: rc %d",rc));
         DebugInt3();
         // vladest
@@ -287 +288 @@
 
 #ifdef DEBUG
-//    dprintf(("WAVEPLAY::Transfer"));
+//    dprintf(("WAVEPLAY::Transfer %ld",ulBytesToTransfer));
 #endif
 
@@ -299 +300 @@
     }
 
+    //PS very strange
+    if (!ulBytesToTransfer)
+    {
+        return TRUE;
+    }
+
 //    if (!waveOpened) return TRUE;
 
     if(pConfigInfo->usConversion == CONVERT_NONE)
     {
-#ifdef DEBUG
-        dprintf(("Transfer. NoConv ulB %ld",ulBytesToTransfer));
-#endif /* DEBUG */
-        if(AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE)
-        {
+        if (AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE)
+        {
+#ifdef DEBUG
+            dprintf(("Transfer.False. NoConv ulB %ld tr:%ld",ulBytesToTransfer,*pulBytesTransferred));
+#endif /* DEBUG */
             *pulBytesTransferred = 0;
             return FALSE;
         }
     }
-    else {
-        if(pConfigInfo->pfnConvert) {
+    else 
+    {
+        if(pConfigInfo->pfnConvert) 
+        {
             ULONG ulCvtBufferSize;
 
@@ -323 +332 @@
             ulBytesToTransfer = CONVERT_LENGTH(ulCvtBufferSize, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
 
-            if(ulBytesToTransfer & (pConfigInfo->ulSampleSize-1)) {
-                DebugInt3();
+            if(ulBytesToTransfer & (pConfigInfo->ulSampleSize-1)) 
+            {
+                dprintf(("Transfer New ulBr %ld" , ulBytesToTransfer));
+//                DebugInt3();
                 ulBytesToTransfer = ulBytesToTransfer & ~(pConfigInfo->ulSampleSize-1);
 #ifdef DEBUG
-                dprintf(("New ulBr %ld" , ulBytesToTransfer));
+                dprintf(("Transfer New ulBr %ld" , ulBytesToTransfer));
 #endif
             }
@@ -338 +349 @@
             //convert back from conversion to 'real'
             *pulBytesTransferred = CONVERT_LENGTH(*pulBytesTransferred, CONVERSION_INVERT(pConfigInfo->ulConversionFactor));
-            if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1)) {
-                DebugInt3();
-#ifdef DEBUG
-                dprintf(("New pulBr %ld" , pulBytesTransferred));
-#endif
+            if(*pulBytesTransferred & (pConfigInfo->ulSampleSize-1)) 
+            {
+#ifdef DEBUG
+                dprintf(("Transfer New pulBr %ld" , pulBytesTransferred));
+#endif
+//                DebugInt3();
             }
         }
-        else {
-            DebugInt3();
+        else 
+        {
+            dprintf(("Transfer Zero pConfigInfo->pfnConvert"));
+//            DebugInt3();
             return FALSE;
         }
@@ -363 +377 @@
 //    if (!waveOpened) return TRUE;
 
+//PS Here is inrerrupt time....
     if (fAPMSuspend)
     {
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::AddBuffer. Suspend state"));
+//        dprintf(("WAVEPLAY::AddBuffer. Suspend state"));
 #endif
         apm_resume();
@@ -372 +387 @@
     }
 
-    if(pConfigInfo->fSampleRateConversion)
+    if (pConfigInfo->fSampleRateConversion)
     {
         ULONG  ulCvtBufferSize, ulSampleCount, ulHwSampleCount;
@@ -378 +393 @@
 
         //bytes to convert is bounded by bytes to transfer & max conversion buffer size
-        ulCvtBufferSize = SRATE_CONVERT_LENGTH(ulBytesToTransfer, pConfigInfo->ulSRatePosition,
-                                               pConfigInfo->ulSRateIncrement);
+        ulCvtBufferSize = SRATE_CONVERT_LENGTH(ulBytesToTransfer, pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement);
         ulCvtBufferSize = min(CONVERSION_BUFFER_SIZE, ulCvtBufferSize);
         //round to sample boundary
         ulCvtBufferSize &= ~(pConfigInfo->ulHwSampleSize - 1);
 
-        if(ulCvtBufferSize == 0) {
+        if(ulCvtBufferSize == 0) 
+        {
             *pulBytesTransferred = ulBytesToTransfer;
-            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) {
+            if(pConfigInfo->ulSRatePosition >= pConfigInfo->ulSRateIncrement) 
+            {
                 pConfigInfo->ulSRatePosition -= pConfigInfo->ulSRateIncrement;
             }
-#ifdef DEBUG
-            dprintf(("WAVEPLAY::AddBuffer %lx %lx %lx -> nothing left", ulBytesToTransfer, pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement));
-#endif /* DEBUG */
             return TRUE;
         }
         pConfigInfo->pfnSRateConv(pUserBuffer, ulCvtBufferSize, pConfigInfo->pSRateConvBuffer,
                                   pConfigInfo->ulSRatePosition, pConfigInfo->ulSRateIncrement);
-//PS++ !!!!! This don't be !!!!!!!
         OSS16_WaveGetSpace(StreamId, &Space);
         if (ulCvtBufferSize > Space)
@@ -403 +415 @@
             dprintf(("WPLAY::AddBuffer need %ld space:%ld", ulCvtBufferSize, Space));
 #endif
-            for (i=0; i < 0xffffff; i++)
+            while (!Space)
+               for (i=0; i < 0xffffff; i++)
+               {
+                    OSS16_WaveGetSpace(StreamId, &Space);
+                    if (Space & ~(pConfigInfo->ulHwSampleSize - 1)) break;
+               }
+#ifdef DEBUG
+            dprintf(("OUT %lx need %ld space:%ld ",i, ulCvtBufferSize, Space));
+#endif
+            if (ulCvtBufferSize > Space)
+                ulCvtBufferSize = Space & ~(pConfigInfo->ulHwSampleSize - 1);
+        }
+        if ((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS 
+             ||  *pulBytesTransferred == 0)
+        {
+            if(rc == OSSERR_BUFFER_FULL) 
             {
-                 OSS16_WaveGetSpace(StreamId, &Space);
-                 if (ulCvtBufferSize <= Space) break;
-            }
-#ifdef DEBUG
-            dprintf(("OUT %ld need %ld space:%ld Last:%ld",i, ulCvtBufferSize, Space,LastSpace));
-#endif
-        }
-        if((rc = OSS16_WaveAddBuffer(StreamId, pConfigInfo->pSRateConvBuffer, ulCvtBufferSize, pulBytesTransferred)) != OSSERR_SUCCESS ||
-           *pulBytesTransferred == 0)
-        {
-            if(rc == OSSERR_BUFFER_FULL) {
                  GetSpace(StreamId, pConfigInfo, &Space);
                  dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
             }
-            else dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
+#ifdef DEBUG
+            else 
+                dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
+#endif
             *pulBytesTransferred = 0;
             return FALSE;
@@ -437 +456 @@
         // if the last sample is still needed for the next run, then adjust sample count and
         // sample rate conversion position
-        if(lSRatePosition < 0) {
+        if(lSRatePosition < 0) 
+        {
             dprintf4(("WAVEPLAY::AddBuffer; sratepos < 0"));
             dprintf4(("ulHwSampleCount %lx pConfigInfo->ulSRateIncrement %lx ulSampleCount %lx", ulHwSampleCount, pConfigInfo->ulSRateIncrement, ulSampleCount));
             pConfigInfo->ulSRatePosition = 0;
         }
-        else {
+        else 
+        {
             pConfigInfo->ulSRatePosition = (ULONG)lSRatePosition;
         }
@@ -451 +472 @@
        if( (rc=OSS16_WaveAddBuffer(StreamId, pUserBuffer, ulBytesToTransfer, pulBytesTransferred)) != OSSERR_SUCCESS)
        {
-        *pulBytesTransferred = 0;
-        dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer failed due to an error rc=%x",(USHORT)rc));
-        return FALSE;
-        }
+            *pulBytesTransferred = 0;
+            dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer failed due to an error rc=%x",(USHORT)rc));
+            dprintf(("StreamID:%x PUB:%lx BtTr:%ld",(USHORT)StreamId, pUserBuffer, ulBytesToTransfer));
+            return FALSE;
+       }
     }
     return TRUE;
@@ -489 +511 @@
 //    if (!waveOpened) return TRUE;
 
-    if(OSS16_WaveGetSpace(StreamId, &space) != OSSERR_SUCCESS) {
+    if(OSS16_WaveGetSpace(StreamId, &space) != OSSERR_SUCCESS) 
+    {
         *pulStreamSpace = 0;
 #ifdef DEBUG
@@ -496 +519 @@
         return FALSE;
     }
-    LastSpace = space;
+
+//    dprintf(("GetSpace: len %ld",space));
     cvt  = ConvertLengthInvert(space, pConfigInfo);
     //round to sample boundary
@@ -509 +533 @@
     ULONG space,cvt;
 
-    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS) {
+    if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS) 
+    {
         *pulHwPtr = 0;
         #ifdef DEBUG
@@ -516 +541 @@
         return FALSE;
     }
+
     cvt  = ConvertLengthInvert(space, pConfigInfo);
     //round to sample boundary
-    *pulHwPtr = cvt & ( ~(pConfigInfo->ulSampleSize - 1));
+    *pulHwPtr = cvt & (~(pConfigInfo->ulSampleSize - 1));
     return TRUE;
 }