Ticket #2552: 2552-v1.patch

libs/libmythtv/nuppeldecoder.cpp

@@ -547 +547 @@
     if (usingextradata && extradata.video_fourcc == MKTAG('D', 'I', 'V', 'X'))
         setreadahead = true;
 
-    ringBuffer->UpdateRawBitrate(0);
+    bitrate = 0;
+    ringBuffer->UpdateRawBitrate(GetRawBitrate());
 
     videosizetotal = 0;
     videoframesread = 0;
@@ -1099 +1100 @@
                 {
                     videosizetotal /= videoframesread;
 
-                    float bps = videosizetotal * 8.0 / 1024 * video_frame_rate;
-                    bps = bps * 3 / 2;
+                    float bps = (videosizetotal * 8.0f / 1024.0f *
+                                 video_frame_rate);
+                    bitrate = (uint) (bps * 1.5f);
 
-                    ringBuffer->UpdateRawBitrate((uint) bps);
+                    ringBuffer->UpdateRawBitrate(GetRawBitrate());
                     setreadahead = true;
                 }
             }

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -2851 +2851 @@
         return;
     }
 
+    // the bitrate is reset by ringBuffer->OpenFile()...
+    ringBuffer->UpdateRawBitrate(GetDecoder()->GetRawBitrate());
+
     ringBuffer->Unpause();
 
     if (discontinuity || newtype)
@@ -2956 +2959 @@
         return;
     }
 
+    // the bitrate is reset by ringBuffer->OpenFile()...
+    ringBuffer->UpdateRawBitrate(GetDecoder()->GetRawBitrate());
+
     ringBuffer->Unpause();
     ringBuffer->IgnoreLiveEOF(false);
 

libs/libmythtv/avformatdecoder.cpp

@@ -270 +270 @@
       ic(NULL),
       frame_decoded(0),             decoded_video_frame(NULL),
       directrendering(false),       drawband(false),
-      bitrate(0),
       gopset(false),                seen_gop(false),
       seq_count(0),                 firstgoppos(0),
       prevgoppos(0),                gotvideo(false),

libs/libmythtv/decoderbase.h

@@ -89 +89 @@
 
     virtual QString GetEncodingType(void) const = 0;
     virtual double  GetFPS(void) const { return fps; }
+    /// Returns the estimated bitrate if the video were played at normal speed.
+    uint GetRawBitrate(void) const { return bitrate; }
 
     virtual void UpdateFramesPlayed(void);
     long long GetFramesRead(void) const { return framesRead; };
@@ -173 +175 @@
     int current_height;
     float current_aspect;
     double fps;
+    uint bitrate;
 
     long long framesPlayed;
     long long framesRead;

libs/libmythtv/RingBuffer.cpp

@@ -492 +492 @@
 {
     QMutexLocker locker(&bitratelock);
     rawbitrate = raw_bitrate;
+    VERBOSE(VB_IMPORTANT, "TMP DEBUG -- UpdateRawBitrate("<<raw_bitrate<<")");
     CalcReadAheadThresh();
 }
 

libs/libmythtv/decoderbase.cpp

@@ -23 +23 @@
 
       current_width(640), current_height(480),
       current_aspect(1.33333), fps(29.97),
+      bitrate(4000),
 
       framesPlayed(0), framesRead(0), lastKey(0), keyframedist(-1),
       indexOffset(0),

libs/libmythtv/avformatdecoder.h

@@ -205 +205 @@
     bool directrendering;
     bool drawband;
 
-    int bitrate;
-
     bool gopset;
     /// A flag to indicate that we've seen a GOP frame.  Used in junction with seq_count.
     bool seen_gop;

libs/libmythtv/ivtvdecoder.cpp

@@ -49 +49 @@
 {
     lastResetTime.start();
     fps = 29.97f;
+    bitrate = 8000;
     lastKey = 0;
 }
 
@@ -277 +278 @@
 
     fps = (ntsc) ? 29.97f : 25.0f; // save for later length calculations
 
-    ringBuffer->UpdateRawBitrate(8000);
+    ringBuffer->UpdateRawBitrate(GetRawBitrate());
 
     if (m_playbackinfo || livetv || watchingrecording)
     {