Ticket #1481: firewire_buf_fix.diff

libs/libmythtv/firewirerecorder.cpp

@@ -22 +22 @@
 #define LOC QString("FireRec: ")
 #define LOC_ERR QString("FireRec, Error: ")
 
-const int FirewireRecorder::kBroadcastChannel    = 63;
-const int FirewireRecorder::kTimeoutInSeconds    = 15;
-const int FirewireRecorder::kConnectionP2P       = 0;
-const int FirewireRecorder::kConnectionBroadcast = 1;
+const int  FirewireRecorder::kBroadcastChannel    = 63;
+const int  FirewireRecorder::kTimeoutInSeconds    = 15;
+const int  FirewireRecorder::kConnectionP2P       = 0;
+const int  FirewireRecorder::kConnectionBroadcast = 1;
+const uint FirewireRecorder::kMaxBufferedPackets  = 8000;
 
 // callback function for libiec61883
 int fw_tspacket_handler(unsigned char *tspacket, int /*len*/,
@@ -157 +158 @@
          return false;
      }
 
-     // Set buffer size
+     // Set buffered packets size
      size_t buffer_size = gContext->GetNumSetting("HDRingbufferSize",
                                                   50 * TSPacket::SIZE);
-     iec61883_mpeg2_set_buffers(fwmpeg, buffer_size / 2);
+     size_t buffered_packets = min(buffer_size / 4, kMaxBufferedPackets);
+     iec61883_mpeg2_set_buffers(fwmpeg, buffered_packets);
      VERBOSE(VB_IMPORTANT, LOC +
-             QString("Buffer size %1 KB").arg(buffer_size));
+             QString("Buffered packets %1 (%2 KB)").
+             arg(buffered_packets).arg(buffered_packets * 4));
 
      // Set speed if needed.
      // Probably shouldn't even allow user to set,

libs/libmythtv/firewirerecorder.h

@@ -78 +78 @@
     MPEGStreamData  *_mpeg_stream_data;
     TSStats          _ts_stats;  
 
-    static const int kBroadcastChannel;
-    static const int kTimeoutInSeconds;
-    static const int kConnectionP2P;
-    static const int kConnectionBroadcast;
+    static const int  kBroadcastChannel;
+    static const int  kTimeoutInSeconds;
+    static const int  kConnectionP2P;
+    static const int  kConnectionBroadcast;
+    static const uint kMaxBufferedPackets;
 };
 
 #endif