Changeset 369

Timestamp:

Sep 3, 2008, 4:08:49 PM (17 years ago)

Author:

rjerant

Message:

Fixed ticket:18 - streaming problem with video playback

Location:

OCO/trunk/drv16

Files:

• waudio.cpp (modified) (2 diffs)
• waudio.hpp (modified) (1 diff)
• wavestrm.cpp (modified) (3 diffs)

OCO/trunk/drv16/waudio.cpp

@@ -1287 +1287 @@
 #pragma on (unreferenced)
 {
+         ULONG  ulBytesPerIRQ; 
+         
 #ifdef DEBUG
     dprintf(("WAVEAUDIO::ConfigDev"));
@@ -1321 +1323 @@
     } /* endswitch */
 
-    // Calculate the PCMConsumeRate
+          // Calculate the BytesPerIRQ
+          // The BytesPerIRQ is the number of bytes consumed by this data format
+          // for every interrupt generated by the codec.
+          // This information is returned to the WAVESTREAM which uses it in
+          // buffer management decisions....
+          // rjj Fix for Bug #18 28082008
+         
+          ulBytesPerIRQ = pConfigInfo->ulSampleRate;
+          ulBytesPerIRQ >>= 5; // 32 interrupts per second
+                               // we can tweak this as needed but generally this should do rjj
+         
+          if (pConfigInfo->ulBitsPerSample == 16) {
+                ulBytesPerIRQ <<= 1;
+          }
+          if (pConfigInfo->ulNumChannels == 2) {
+                ulBytesPerIRQ <<= 1;
+          }
+          // make sure it's an even multiple of 64
+          ulBytesPerIRQ += 0x00000040;
+          ulBytesPerIRQ &= 0xFFFFFFC0;
+                
+          if (ulBytesPerIRQ > 0x800) {
+                ulBytesPerIRQ = 0x800;
+          }
+          pConfigInfo->ulBytesPerIRQ = ulBytesPerIRQ;
+
+          // Calculate the PCMConsumeRate
     // The consume rate is the number of bytes consumed by this data format
     // per second. It calculated by taking the following equation:

OCO/trunk/drv16/waudio.hpp

@@ -76 +76 @@
    ULONG  ulDataType;        // type of data (PCM, MuLaw, ALaw etc) Input
    ULONG  ulPCMConsumeRate;  // number of bytes consumed/produced per sec Output
+         ULONG  ulBytesPerIRQ;     // The number of bytes consumed per irq rjj Fix for Bug #18 28082008
 
    ULONG  ulFragsize;

OCO/trunk/drv16/wavestrm.cpp

@@ -299 +299 @@
     case STREAM_WRITE:
     {
-        if(pahw->GetPosition(StreamId, &_configinfo, &ulCurBytesProcessed) == FALSE ||
+        if(pahw->GetPosition(StreamId, &_configinfo, &ulCurBytesProcessed) == FALSE || 
            ulCurBytesProcessed == 0) 
         {//shouldn't happen
@@ -318 +318 @@
 
             ulStreamPos  = pahw->ConvertPositionInvert(ulCurBytesProcessed, &_configinfo);
-             //round to sample boundary
+            //round to sample boundary
             ulStreamPos &= ~(_configinfo.ulSampleSize - 1);
 
 #ifdef DEBUG
-              dprintf(("WARNING: Process: Current pos %ld pos %ld incr %d", ulCurBytesProcessed, _ulBytesProcessed, bytesinc));
-              dprintf(("WARNING: hw pos %lx, streampos %lx", ulCurBytesProcessed, ulStreamPos));
+            dprintf(("WARNING: Process: Current pos %ld pos %ld incr %d", ulCurBytesProcessed, _ulBytesProcessed, bytesinc));
+            dprintf(("WARNING: hw pos %lx, streampos %lx", ulCurBytesProcessed, ulStreamPos));
 #endif /* DEBUG */
         }
@@ -330 +330 @@
         while(bytesinc) 
         {
-            if(qhDone.IsElements()) {  // if there are buffers that have been
-                                       // completly written to the audio buffer
+          if(qhDone.IsElements()) {  // if there are buffers that have been completly written to the audio buffer
                                        // check the first one on the done queue
-                                       // if it's data has been consumed by
-                                       // the hardware return it
+                                       // if it's data has been consumed by the hardware return it.
+                                                         // Bug #18 Sometimes MMPM gives us really small buffers. If we 
+                                                         // wait for the buffer to be completly consumed and there is a tiny buffer
+                                                         // on the queue after this one, the sound part could underrun before we get a 
+                                                         // chance to refill it. To fix this we will return the buffer if it will be  
+                                                         // consumed before the next call to WAVESTREAM:Process(). 
+                                                         // rjj Fix for Bug #18 28082008
                 ptemp = (PSTREAMBUFFER)qhDone.Head();
                 ptemp->ulDonepos += bytesinc;
                 bytesinc          = 0;
-                if(ptemp->ulDonepos >= ptemp->ulBuffsz) 
+                                  if ((ptemp->ulDonepos + _configinfo.ulBytesPerIRQ) >= ptemp->ulBuffsz)
                 {
                     //calc position in next buffer
                     bytesinc = ptemp->ulDonepos - ptemp->ulBuffsz;
-//                    dprintf2(("Process: Return buffer %lx size %d", ptemp->pBuffptr, ptemp->ulBuffsz));
+//                  dprintf2(("Process: Return buffer %lx size %d", ptemp->pBuffptr, ptemp->ulBuffsz));
                     ReturnBuffer();
-                        }
-            }
+                          }
+          }
             else        break; //shouldn't happen
         }