Ticket #12901: longeraudiograph.patch

mythtv-master/mythtv/libs/libmythtv/mythplayer.cpp

@@ -4137 +4137 @@
     QMutexLocker locker(&osdLock);
     if (!osd)
         return false;
-
+    
+    int frames2buf = 32 ;
     m_audiograph.SetPainter(videoOutput->GetOSDPainter());
     int sample_rate = GetAudio()->GetSampleRate();
     m_audiograph.SetSampleRate(sample_rate);
-    m_audiograph.SetSampleCount((unsigned)(sample_rate / video_frame_rate));
+    m_audiograph.SetSampleCount((unsigned)( frames2buf * sample_rate / video_frame_rate));
     GetAudio()->addVisual(&m_audiograph);
 
     savedAudioTimecodeOffset = tc_wrap[TC_AUDIO];

mythtv-master/mythtv/libs/libmyth/audio/audiooutputgraph.cpp

@@ -17 +17 @@
 
 #define LOC QString("AOG::%1").arg(__func__)
 
-const int kBufferMilliSecs = 500;
+const int kBufferMilliSecs = 1600;
 
 /*
  * Audio data buffer
@@ -27 +27 @@
 public:
     Buffer() :
         m_maxSamples(0),
-        m_sample_rate(44100),
+        m_sample_rate(48000),
         m_tcFirst(0), m_tcNext(0),
         m_bits(0),
         m_channels(0),
@@ -51 +51 @@
             timecode = m_tcNext;
 
         int64_t tc1 = timecode - Samples2MS(m_maxSamples / 2);
-        if (tc1 < (int64_t)m_tcFirst)
-            tc1 = m_tcFirst;
-
+  
         int64_t tc2 = tc1 + Samples2MS(m_maxSamples);
-        if (tc2 > (int64_t)m_tcNext)
-        {
-            tc2 = m_tcNext;
-            if (tc2 < tc1 + (int64_t)Samples2MS(m_maxSamples))
-            {
-                tc1 = tc2 - Samples2MS(m_maxSamples);
-                if (tc1 < (int64_t)m_tcFirst)
-                    tc1 = m_tcFirst;
-            }
-        }
+  
         return range_t(tc1, tc2);
     }
 
@@ -94 +83 @@
 
         unsigned samples = Bytes2Samples(len);
         uint64_t tcNext = timecode + Samples2MS(samples);
-
-        if (qAbs(timecode - m_tcNext) <= 1)
+        
+        
+        int64_t discontinuity = timecode - m_tcNext ;
+        if (qAbs(discontinuity) <=  1L ) 
         {
             Append(b, len, bits);
             m_tcNext = tcNext;
@@ -126 +117 @@
 
     const int16_t* Data16(const range_t &avail) const
     {
-        unsigned start = MS2Samples(avail.first - m_tcFirst);
+        unsigned start = 0 ; // MS2Samples(avail.first - m_tcFirst);
         return reinterpret_cast< const int16_t* >(constData() + start * BytesPerSample());
     }
 
@@ -274 +265 @@
 
     LOG(VB_PLAYBACK, LOG_INFO, LOC +
         QString("(%1) using [%2..%3] avail [%4..%5]")
-        .arg(timecode).arg(avail.first).arg(avail.second)
-        .arg(m_buffer->First()).arg(m_buffer->Next()) );
-
-    const int width = m_buffer->Samples(avail);
-    if (width <= 0)
-        return 0;
+        .arg(timecode).arg(avail.first).arg(avail.second - avail.first)
+        .arg(m_buffer->First()).arg(m_buffer->Next() - m_buffer->First()) );
+    
+    const int frames2show = 32 , bufwidth = 1280 , imwidth = 512 ;
+
+//    const int bufwidth = m_buffer->Samples(avail);
+//    if (bufwidth <= 0)
+//        return 0;
 
     const unsigned range = 1U << m_buffer->BitsPerChannel();
     const double threshold = 20 * log10(1.0 / range); // 16bit=-96.3296dB => ~6dB/bit
@@ -287 +280 @@
     if (height <= 0)
         return 0;
 
-    QImage image(width, height, QImage::Format_ARGB32);
+    QImage image(imwidth, height, QImage::Format_ARGB32);
     image.fill(0);
 
     const int channels = m_buffer->Channels();
 
     // Assume signed 16 bit/sample
     const int16_t *p = m_buffer->Data16(avail);
-
-    for (int x = 0; x < width; ++x)
+    
+    int bufstep = bufwidth/imwidth , pstep = bufstep * channels ; 
+    for (int x = 0; x < imwidth; x++ )
     {
         int left = p[0];
         int right = channels > 1 ? p[1] : left;
-        p += channels;
+        p += pstep;   
 
         unsigned avg = qAbs(left) + qAbs(right);
         double db = 20 * log10( (double)(avg ? avg : 1) / range);
@@ -316 +310 @@
             v = height - 1;
         else if (v < 0)
             v = 0;
-
-        for (int y = 0; y <= v; ++y)
-            image.setPixel(x, height - 1 - y, rgb);
+        
+        for ( int y = 0; y <= v ; y++ )
+        {
+                image.setPixel( x , height - 1 - y , rgb );
+        }
+        
+   
     }
+    
+    // show frame markers
+    QRgb rgb = qRgb(255, 255, 255) ;
+    int v = (height * 7 / 8) ;
+    for (int x = 0; x < imwidth ; x += (imwidth / frames2show) )
+    {
+         for ( int y = 0; y <= v ; y++ )
+        {
+                image.setPixel( x , height - 1 - y , rgb );
+        }
+    }   
+    
 
     MythImage *mi = new MythImage(m_painter);
     mi->Assign(image);