Ticket #5313: 5313-v1.patch

libs/libmyth/audiooutputbase.h

@@ -74 +74 @@
     virtual void Drain(void);
  
     virtual int GetAudiotime(void);
+    virtual int GetAudioBufferedTime(void) const;
 
     // Send output events showing current progress
     virtual void Status(void);

libs/libmyth/audiooutputalsa.cpp

@@ -89 +89 @@
     }
     else
     {
-        fragment_size = 6144; // nicely divisible by 2,4,6,8 channels @ 16-bits
-        buffer_time = 500000; // 500 ms
-        period_time = buffer_time / 4;  // 4 interrupts per buffer
+        fragment_size = 1536 * audio_channels * audio_bits / 8;
+        period_time = 25000;  // in usec, interrupt period time
+        // in usec, for driver buffer alloc (64k max)
+        buffer_time = period_time * 16;
     }
 
     if (audio_bits == 8)

libs/libmyth/audiooutputbase.cpp

@@ -110 +110 @@
 void AudioOutputBase::SetStretchFactorLocked(float laudio_stretchfactor)
 {
     effdspstretched = (int)((float)effdsp / laudio_stretchfactor);
-    if (audio_stretchfactor != laudio_stretchfactor)
+    if ((audio_stretchfactor != laudio_stretchfactor) ||  !pSoundStretch)
     {
         audio_stretchfactor = laudio_stretchfactor;
         if (pSoundStretch)
@@ -363 +363 @@
 
     if (redo_stretch)
     {
-        float laudio_stretchfactor = audio_stretchfactor;
         delete pSoundStretch;
         pSoundStretch = NULL;
-        audio_stretchfactor = 0.0f;
-        SetStretchFactorLocked(laudio_stretchfactor);
+        SetStretchFactorLocked(audio_stretchfactor);
     }
     else
     {
@@ -678 +676 @@
     pthread_mutex_unlock(&audio_buflock);
 }
 
+int AudioOutputBase::GetAudioBufferedTime(void) const
+{
+     return audbuf_timecode - GetAudiotime();
+}
+
 bool AudioOutputBase::AddSamples(char *buffers[], int samples, 
                                  long long timecode)
 {
@@ -699 +702 @@
         len += (pSoundStretch->numUnprocessedSamples() +
                 (int)(pSoundStretch->numSamples()/audio_stretchfactor))*abps;
 
-    if (((len > afree) || ((audbuf_timecode - GetAudiotime()) > 2000)) && !blocking) 
+    if (((len > afree) && !blocking) 
     {
         VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + QString(
                 "AddSamples FAILED bytes=%1, used=%2, free=%3, timecode=%4") 
@@ -768 +771 @@
                 (int)(pSoundStretch->numSamples()/audio_stretchfactor))*abps;
     }
 
-    if (((len > afree) || (audiotime && ((audbuf_timecode - GetAudiotime()) > 2000))) && !blocking) 
+    if (((len > afree) && !blocking) 
     {
         VERBOSE(VB_AUDIO|VB_TIMESTAMP, LOC + QString(
                 "AddSamples FAILED bytes=%1, used=%2, free=%3, timecode=%4") 
@@ -958 +961 @@
                     if (audio_bits == 16)
                         audiobuffer[org_waud++] = mybuf[chan][itemp+1];
 
-                    if (org_waud >= AUDBUFSIZE)
-                        org_waud -= AUDBUFSIZE;
+                    org_waud %= AUDBUFSIZE;
                 }
             }
         }
@@ -1034 +1036 @@
                         memcpy(audiobuffer + org_waud, ob, amount);
 
                     bdiff = AUDBUFSIZE - amount;
-                    org_waud += amount;
+                    org_waud += (org_waud + amount) % AUDBUFSIZE;
                 }
             }
             else
@@ -1061 +1063 @@
                     }
                     else
                     {
-                        org_waud += nSamples * audio_bytes_per_sample;
+                        int bufsz = nSamples * audio_bytes_per_sample;
+                        org_waud = (org_waud + bufsz) % AUDBUFSIZE;
                         nSamplesToEnd -= nSamples;
                     }
 

libs/libmyth/audiooutput.h

@@ -62 +62 @@
 
     virtual int GetAudiotime(void) = 0;
 
+    /// report amount of audio buffered in milliseconds.
+    virtual int GetAudioBufferedTime(void) const { return 0; }
+
     virtual void SetSourceBitrate(int ) { }
 
     QString GetError(void)   const { return lastError; }