Changeset 468 for OCO/trunk/drv16/wavestrm.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/wavestrm.cpp (modified) (25 diffs)

OCO/trunk/drv16/wavestrm.cpp

@@ -115 +115 @@
       // if there is a buffer on the InProcess Queue
       // only check the first one as any others are just waiting.....
-      if (qhInProcess.IsElements()) {
+      if (qhInProcess.IsElements()) 
+      {
            // if any data has been written from this stream buffer
          ptempbuff = (PSTREAMBUFFER)qhInProcess.Head();
-         if (ptempbuff->ulDonepos) {
-            _vRealignBuffer(endpos, ptempbuff);
-         } /* end if ulDonepos */
+         if (ptempbuff->ulDonepos) 
+         {
+             _vRealignBuffer(endpos, ptempbuff);
+         }  /* end if ulDonepos */
       }
 
@@ -131 +133 @@
       // If the rc is 1 then put it on the head of the InProcess queue.
 
-      while (qhDone.IsElements()) {
+      while (qhDone.IsElements()) 
+      {
          pTempHead->PushOnHead(qhDone.PopHead());
       } /* endwhile */
 
-      while (pTempHead->IsElements()) {
+      while (pTempHead->IsElements()) 
+      {
          usRC = _vRealignBuffer(endpos, (PSTREAMBUFFER)pTempHead->Head());
          if (usRC)
@@ -159 +163 @@
 #pragma on (unreferenced)
 {
-    ULONG space, byteswritten;
-
-    dgprintf(("AddBuffers"));
+    ULONG space, byteswritten, curspace,i;
+
+//    dgprintf(("AddBuffers %d",fFirst == TRUE?1:2));
 
     byteswritten = 0;
-    if (ulStreamType & STREAM_WRITE) {
+    if (ulStreamType & STREAM_WRITE) 
+    {
         // get the space available in the hardware buffer
         // only call GetSpace once because the amount of free space in
@@ -170 +175 @@
         // could keep us in this loop writing 4 or 8 bytes at a time.
         // In extream cases we will stay stuck in this loop long enough to casue a trap rjj
-        if(pahw->GetSpace(StreamId, &_configinfo, &space) == FALSE) {
-            dgprintf(("WAVESTREAM::AddBuffers Error 1"));
+         if (pahw->GetSpace(StreamId, &_configinfo, &space) == FALSE) 
+        {
+//            dgprintf(("WAVESTREAM::AddBuffers Error 1"));
             return;
         }
-        space &= ( ~(_configinfo.ulSampleSize - 1));
-        while (space && qhInProcess.IsElements()) {
-            byteswritten = AddBuffer(space);
+        space &= (~(_configinfo.ulSampleSize - 1));
+        curspace = space;
+        while (space && qhInProcess.IsElements()) 
+        {
+            // Fisrt time going in task time
+            // for I7 need give time for interrupt time
+            if (fFirst == TRUE)  //PS+++
+            {
+                 DevHelp_ProcBlock (space, 20, 0);
+            }
+//            dgprintf(("AddBuffers write %ld SSize:%ld %d",space, _configinfo.ulSampleSize, fFirst == TRUE?1:2));
+            byteswritten = AddBuffer(space > curspace? curspace: space);
+            if (pahw->GetSpace(StreamId, &_configinfo, &curspace) == FALSE) 
+            {
+//                dgprintf(("WAVESTREAM::AddBuffers Error 2"));
+                return;
+            }
             if(byteswritten == (ULONG)-1)
                 break;
+            if (!curspace)
+            {
+                curspace = _configinfo.ulSampleSize;
+            }
             space -= byteswritten;
             space &= ( ~(_configinfo.ulSampleSize - 1));
@@ -184 +208 @@
 
     }
+//    dgprintf(("AddBuffers %d End",fFirst == TRUE?1:2));
 }
 //******************************************************************************
@@ -197 +222 @@
     ULONG Buff_left, byteswritten, start_pos;
 
-    ddprintf(("AddBuffer"));
+//    ddprintf(("AddBuffer"));
     // make sure we have a buffer to copy from.....
-    if (!pTemp) {
+    if (!pTemp) 
+    {
         return (ULONG)-1;
     }
@@ -212 +238 @@
     }
 
+    if (!pTemp->ulBuffsz || !space)
+    {
+        dgprintf(("WAVESTREAM::AddBuffer NULL, Bufsz:%ld Space:%ld",pTemp->ulBuffsz, space));
+        //PS+++ if is ZERO do nothing and ask for give new buffer, See REMARK in mmpm2.inf
+        qhDone.PushOnTail(qhInProcess.PopHead());
+//        DebugInt3();
+        return 0;
+    }
     // get the buffer pointer and amount of data remaining
     pdataBuf  = (ULONG)pTemp->pBuffptr + pTemp->ulBuffpos;
@@ -217 +251 @@
     Buff_left = min(Buff_left, space);
 
-    if(pahw->Transfer(StreamId, &_configinfo, pdataBuf, Buff_left, &byteswritten) == FALSE) {
+    if (pahw->Transfer(StreamId, &_configinfo, pdataBuf, Buff_left, &byteswritten) == FALSE) 
+    {
         dgprintf(("AddBuffer: pahw->Transfer failed!!"));
+//        DebugInt3();
         return (ULONG)-1;
     }
-    if(byteswritten == 0) {
+    if (byteswritten == 0) 
+    {
+        dgprintf(("AddBuffer: No more room!!"));
+//        DebugInt3();
         return (ULONG)-1; //no more room
     }
@@ -231 +270 @@
 
     // check to see if the buffer has been copied and needs to be put on the done queue
-    if (pTemp->ulBuffpos >= (pTemp->ulBuffsz & 0xFFFFFFFC)) {
+    if (pTemp->ulBuffpos >= (pTemp->ulBuffsz & 0xFFFFFFFC)) 
+    {
         qhDone.PushOnTail(qhInProcess.PopHead());
     }
-    dgprintf(("WAVESTREAM::AddBuffer sz %lx, bywr %lx dp %lx", Buff_left, byteswritten,pTemp->ulDonepos));
+//    dgprintf(("WV::AddBuffer sz %lx, bywr %lx dp %lx", Buff_left, byteswritten,pTemp->ulDonepos));
     return byteswritten;
 }
@@ -255 +295 @@
 
     // read wave data
-    if(pahw->Transfer(StreamId, &_configinfo, pdataBuf, Buff_left, &bytesread) == FALSE) {
+    if(pahw->Transfer(StreamId, &_configinfo, pdataBuf, Buff_left, &bytesread) == FALSE) 
+    {
        dprintf(("_vReadAudioBuf: pahw->Transfer failed!!"));
        return FALSE;
@@ -284 +325 @@
 // can be returned and finally process any events pending.
 //******************************************************************************
+//USHORT ProcNumber = 0;
 void DBGCALLCONV WAVESTREAM::Process(void)
 {
  PSTREAMBUFFER ptemp;
  ULONG         ulCurBytesProcessed = 0;
-// ULONG         bytesinc;
+// USHORT        CurProcNumber = ProcNumber++;
+ ULONG         space;
 
 #ifdef DEBUG
-    ddprintf(("WAVESTREAM::Process"));
+//    ddprintf(("WAVESTREAM::Process %d",CurProcNumber));
 #endif
 
@@ -304 +347 @@
         return;
     }
-    ddprintf(("StPos: %lx", ulCurBytesProcessed));
+//    ddprintf(("StPos: %lx", ulCurBytesProcessed));
     // save the bytes processed in the stream object
     _ulBytesProcessed = ulCurBytesProcessed;
 
+//    if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) && (space > _configinfo.ulBytesPerIRQ))
     switch (ulStreamType & STREAM_WRITE) {
 
@@ -322 +366 @@
         case STREAM_WRITE:
         {
-          if(qhDone.IsElements()) {
+            if (qhDone.IsElements()) 
+            {
                 ptemp = (PSTREAMBUFFER)qhDone.Head();
                 while ((_ulBytesProcessed + _configinfo.ulBytesPerIRQ) >= ptemp->ulDonepos)
@@ -330 +375 @@
                 }
             }
-            if (qhInProcess.IsElements()){
+            if (qhInProcess.IsElements())
+            {
                AddBuffers(FALSE);
             }
@@ -345 +391 @@
 
     ProcessEvents();
+//    ddprintf(("WAVESTREAM::Process %d End",CurProcNumber));
 }
 //******************************************************************************
@@ -353 +400 @@
 {
     PSTREAMBUFFER pStreamBuf = new STREAMBUFFER(uLength, pbuf);
-
+ 
     return Write(pStreamBuf);
 }
@@ -390 +437 @@
     ULONG Seconds, MilliSeconds, Overflow, Processed;
 
+//PS++ optimize code
+    Processed = _ulBytesProcessed;
     if (ulStreamState == STREAM_STREAMING)  // if the stream is active
     {
-        if (ulStreamType & STREAM_WRITE)
-        {
-            if(pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
-            {
-                DebugInt3();
+       if (ulStreamType & STREAM_WRITE)
+       {
+           if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
+           {
+//                DebugInt3();
                 Processed = _ulBytesProcessed; //last known position
-            }
-        }
-        else
-            Processed = _ulBytesProcessed;
-    }
-    else
-        Processed = _ulBytesProcessed;
+           }
+        }
+    }
 
     // if we haven't processed anything then just return
@@ -411 +456 @@
         return(_ulTimeBase);
 
-    Seconds = Processed / _configinfo.ulPCMConsumeRate;
+    Seconds  = Processed / _configinfo.ulPCMConsumeRate;
     Overflow = Processed - (Seconds * _configinfo.ulPCMConsumeRate);
     MilliSeconds = (Overflow * 1000) / _configinfo.ulPCMConsumeRate;
     MilliSeconds += (Seconds * 1000);
-    return(MilliSeconds + _ulTimeBase);
+    return (MilliSeconds + _ulTimeBase);
 }
 //******************************************************************************
@@ -423 +468 @@
     ULONG Processed;
 
+//PS++ optimize code
+    Processed = _ulBytesProcessed;
     if (ulStreamState == STREAM_STREAMING)  // if the stream is active
     {
-        if (ulStreamType & STREAM_WRITE) {
-            if(pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
-            {
+        if (ulStreamType & STREAM_WRITE) 
+       {
+           if (pahw->GetPosition(StreamId, &_configinfo, &Processed) == FALSE)
+           {
                 DebugInt3();
                 Processed = _ulBytesProcessed; //last known position
-            }
+           }
         }
-        else
-            Processed = _ulBytesProcessed;
-    }
-    else
-        Processed = _ulBytesProcessed;
+    }
 
     return Processed;
@@ -446 +490 @@
    ULONG writepos = 0;
 
+// May be lock?
    cli();
    PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Tail();
 
-   if(!pTemp) {
+   if(!pTemp) 
+   {
        pTemp = (PSTREAMBUFFER)qhInProcess.Head();
    }
-   if(pTemp) {
+   if(pTemp) 
+   {
        writepos = pTemp->ulBuffpos;
    }
@@ -478 +525 @@
 #endif
 
-    if(ulStreamState == STREAM_STREAMING) {
+    if(ulStreamState == STREAM_STREAMING) 
+    {
         ddprintf(("StartStream: already playing!!"));
         return NO_ERROR;
@@ -485 +533 @@
     // configure the wave device
     // (NOTE: Must call this function; sample rate position is reset there)
-    if(pahw->ConfigDev(StreamId, &_configinfo, (pTemp) ? pTemp->ulBuffsz : 0) == FALSE) {
+    if(pahw->ConfigDev(StreamId, &_configinfo, (pTemp) ? pTemp->ulBuffsz : 0) == FALSE) 
+    {
         ddprintf(("StartStream: ConfigDev failed!!"));
-        goto fail;
+        return ERROR_INSUFF_BUFFER;
+//        goto fail;
     }
     // prepare wave device for playback/recording
-    if(pahw->Prepare(StreamId) == FALSE) {
+    if(pahw->Prepare(StreamId) == FALSE) 
+    {
         ddprintf(("StartStream: Prepare failed!!"));
         goto fail;
@@ -499 +550 @@
     ulStreamState = STREAM_STREAMING;
     //Adding the first buffer also starts playback
-    if(ulStreamType == STREAM_WAVE_PLAY) {
+    if (ulStreamType == STREAM_WAVE_PLAY) 
+    {
+       pahw->SetVolume(StreamId, getMixerStreamId(), volume);    //PS
         AddBuffers(TRUE);
         //Must set volume after adding buffers (voices inside sblive driver might not
         //be allocated otherwise (first start) )
-        dprintf(("SetVolume %lx",volume));
-        pahw->SetVolume(StreamId, getMixerStreamId(), volume);
-    }
-    else {
+//        dprintf(("SetVolume %lx",volume));
+// PS, removing to high
+//       pahw->SetVolume(StreamId, getMixerStreamId(), volume);
+    }
+    else 
+    {
         ulSavedInputGain = pahw->QueryVolume(StreamId, getMixerStreamId());
         pahw->SetInputSrc(StreamId, getMixerStreamId(), inputsrc);
         pahw->SetVolume(StreamId, getMixerStreamId(), inputgain);
 
-        if(pahw->Start(StreamId) != TRUE) {
+        if(pahw->Start(StreamId) != TRUE) 
+       {
             dprintf(("pahw->Start failed!!"));
             goto fail;
         }
     }
-    ddprintf(("WAVESTREAM::StartStream %lx", StreamId));
+    ddprintf(("WAVESTREAM::StartStream %lx End", StreamId));
     return NO_ERROR;
 
@@ -665 +721 @@
         if(DevHelp_VMAlloc((VMDHA_FIXED | VMDHA_CONTIG), CONVERSION_BUFFER_SIZE, (ULONG)-1L, &linAddr, &pSelOff) != 0)
         {
-                           //dgprintf(("Error in DevHelp_VMAlloc Conversion Buffer"));
+             dgprintf(("Error in DevHelp_VMAlloc Conversion Buffer"));
              DebugInt3(); //should never happen!!
              _configinfo.usConversion = CONVERT_NONE;
@@ -676 +732 @@
         LIN   linAddr;
 
-        if(DevHelp_VMAlloc((VMDHA_FIXED | VMDHA_CONTIG), CONVERSION_BUFFER_SIZE, (ULONG)-1L, &linAddr, &pSelOff) != 0)
+        if (DevHelp_VMAlloc((VMDHA_FIXED | VMDHA_CONTIG), CONVERSION_BUFFER_SIZE, (ULONG)-1L, &linAddr, &pSelOff) != 0)
         {
-                         //dgprintf(("Error in DevHelp_VMAlloc SR Conversion Buffer"));
-                         DebugInt3(); //should never happen!!
+            dgprintf(("Error in DevHelp_VMAlloc SR Conversion Buffer"));
+            DebugInt3(); //should never happen!!
         }
         else _configinfo.pSRateConvBuffer = linAddr;