Radio live prebuffering fix, compile problem with new demuxer stripaudio

fixed

diff --git a/demuxer.cc b/demuxer.cc
index 3b1c6d9fb9d39bb3753c5c4541a9eebf2ad86f1d..f03b279ac0a8c82a0de3c567aecc76d17e138cf2 100644 (file)
--- a/demuxer.cc
+++ b/demuxer.cc
@@ -324,7 +324,7 @@ UINT Demuxer::stripAudio(UCHAR* buf, UINT len)
   while (read_pos + 7 <= len)
   {
     pattern = ((pattern & 0xFFFFFF) << 8) | buf[read_pos+3];
-    if (pattern < 0x100|PESTYPE_VID0 || pattern > 0x100|PESTYPE_VIDMAX)
+    if (pattern < (0x100|PESTYPE_VID0) || pattern > (0x100|PESTYPE_VIDMAX))
       read_pos++;
     else
     {
@@ -344,3 +344,7 @@ UINT Demuxer::stripAudio(UCHAR* buf, UINT len)
   }
   return write_pos;
 }
+
+
+
+

diff --git a/player.cc b/player.cc
index b8be8608ed2bde62b747accff1028766370ad3db..b426b2acb8bc82434556b1e0e44dc8c329646046 100644 (file)
--- a/player.cc
+++ b/player.cc
@@ -46,14 +46,16 @@ Player::Player(MessageQueue* messageQueue, bool tIsRecording, bool tIsRadio)
 
   if (isRadio)
   {
-    blockSize = 20000;
-    startupBlockSize = 60000;
+    blockSize = 10000;
+    startupBlockSize = 20000;
+    preBufferSize = 20000;
     video->turnVideoOff();
   }
   else
   {
     blockSize = 100000;
     startupBlockSize = 250000;
+    preBufferSize = 500000;
     video->turnVideoOn();
   }
 }
@@ -829,7 +831,7 @@ void Player::threadFeedLive()
     if (preBuffering)
     {
       preBufferTotal += thisRead;
-      if (preBufferTotal > 500000)
+      if (preBufferTotal >= preBufferSize)
       {
         logger->log("Player", Log::DEBUG, "Got >500K, prebuffering complete");
 

diff --git a/player.h b/player.h
index 0920c589585450083ead1c01e03e91d2e3a4a12a..8c02d7ffe96e088888f6862a4ab329853614b339 100644 (file)
--- a/player.h
+++ b/player.h
@@ -130,6 +130,7 @@ class Player : public Thread_TYPE, public Callback
     ULONG currentFrameNumber;
     UINT blockSize;
     UINT startupBlockSize;
+    UINT preBufferSize;
     UCHAR* threadBuffer;
     UCHAR state;
     UCHAR ifactor;