Ticket #9930: audiooutputalsa.cpp.diff

*** audiooutputalsa.cpp---org   Sun May 15 22:57:52 2011
--- audiooutputalsa.cpp Thu Jul 21 10:22:40 2011
*************** void AudioOutputALSA::WriteAudio(uchar *
*** 508,513 ****
--- 508,521 ----
          return;
      }
  
+     // check if size is a multiple of alsa-frames
+     if ((size % (output_bytes_per_frame * channels)) != 0) {
+         int size_needed = (size / (output_bytes_per_frame * channels)) * channels * output_bytes_per_frame;
+         VBERROR(QString(LOC + "WriteAudio: data not aligned to alsa-frame size"));
+         VBERROR(QString(LOC + "            size: %1, size needed: %2")
+                         .arg(size).arg(size_needed));
+     }
+ 
      if ((!passthru && channels == 6) || channels == 8)
          ReorderSmpteToAlsa(aubuf, frames, output_format, channels - 6);
  
*************** int AudioOutputALSA::SetParameters(snd_p
*** 724,731 ****
              .arg(buffer_size).arg(period_size));
  
      /* set member variables */
      soundcard_buffer_size = buffer_size * output_bytes_per_frame;
!     fragment_size = (period_size * output_bytes_per_frame) >> 1;
  
      /* get the current swparams */
      err = snd_pcm_sw_params_current(handle, swparams);
--- 732,749 ----
              .arg(buffer_size).arg(period_size));
  
      /* set member variables */
+     // buffer_size and period_size are alsa-frames:
+     // one alsa-frame = (output_bytes_per_frame * channels) bytes
+     // at least fragment_size has to be a multiple of alsa-frames
+     // because its value is given to WriteAudio() as size
      soundcard_buffer_size = buffer_size * output_bytes_per_frame;
!     snd_pcm_uframes_t org_period_size = period_size;
!     period_size = period_size - (period_size % (channels * output_bytes_per_frame));
!     fragment_size = (period_size * output_bytes_per_frame);
!     if (org_period_size != period_size) {
!         VBAUDIO(QString("Period size changed from %1 to %2")
!                 .arg(org_period_size).arg(period_size));
!     }
  
      /* get the current swparams */
      err = snd_pcm_sw_params_current(handle, swparams);