Version 1.3.21vdr-1.3.21

- Fixed cDvbDevice::SetAudioTrackDevice() to avoid a blank screen after switching
  back to live mode if a recording is currently active on the primary device.
- Fixed a possible freeze in pause mode in case a device's PlayPesPacket() function
  permanently returns 0 (thanks to Reinhard Nissl and Olaf Titz).
- Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Restricted the "setting audio track" log message to automatic changes during replay.
- Fixed handling Transfer Mode for radio channels (thanks to Andreas Regel for
  reporting this one).
- Fixed handling symbolic links in cRecordings::ScanVideoDir() (thanks to Stefan
  Huelswitt).
- Completed the Danish OSD texts (thanks to Mogens Elneff).
- Forcing a new resync after a call to cRemux::Clear() (suggested by Marco Schlüßler).
- The cAudio::Play() function now has an additional parameter 'uchar Id' which tells
  the function the substream id of the given audio packet, so that a plugin can
  take the right action for the various kinds if audio data - which now also includes
  "normal" audio with ids 0xC0...0xDF (based on suggestions by Werner Fink and Macro
  Schlüßler).
- Removed the "Cleared/PlayPes(NULL, 0)" handling from cTransfer::Action(), since this
  is now done when attaching the player to the device (thanks to Marco Schlüßler).
- Making sure the buffer reserve in cTransfer::Action() is re-established after
  clearing the buffer.
- Added DeviceClrAvailableTracks() and DeviceSetCurrentAudioTrack() to cPlayer
  (thanks to Marco Schlüßler).
- Fixed a typo in detecting UTF-8 (thanks to Reinhard Nissl).
- Now using twice the buffer reserve in cTransfer if the primary DVB card is an
  unmodified version with only 2MB of SDRAM, to avoid audio stuttering when
  playing Dolby Digital over the DVB card (thanks to Christian Jacobsen and Chad
  Flynt for suggestions and experiments in that area).
- Making sure the first audio packet is not dropped when switching to "pre 1.3.19
  Dolby Digital compatibility mode".
- The 'plugins-clean' target of the Makefile now only deletes the actual plugin
  library files from this version of VDR (suggested by Andreas Brachold).
- Added a missing 'resultSkipped = 0' to cRemux::Clear() (thanks to Marco Schlüßler
  for reporting this one).
- The new function cDvbDevice::SetTransferModeForDolbyDigital() can be used by
  plugins that implement Dolby Digital output and thus want to prevent the cDvbDevice
  from starting Transfer Mode in order to replay DD over the DVB device.
- Added missing reset of the 'repacker' to cTS2PES::Clear() (thanks to Marco
  Schlüßler for reporting this one).

1 files changed, 23 insertions, 15 deletions

diff --git a/transfer.c b/transfer.c
index b3cbec4..331ac62 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.25 2005/01/23 14:27:40 kls Exp $
+ * $Id: transfer.c 1.27 2005/02/12 15:54:06 kls Exp $
  */
 
 #include "transfer.h"
@@ -54,24 +54,26 @@ void cTransfer::Receive(uchar *Data, int Length)
      }
 }
 
+#define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+//XXX This is a very ugly hack to allow cDvbOsd to reduce the buffer
+//XXX requirements in cTransfer if it detects a 4MB full featured DVB card.
+bool DvbCardWith4MBofSDRAM = false;
+#endif
+
 void cTransfer::Action(void)
 {
   int PollTimeouts = 0;
   uchar *p = NULL;
   int Result = 0;
-#define FW_NEEDS_BUFFER_RESERVE_FOR_AC3
 #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-  bool Cleared = false;
   bool GotBufferReserve = false;
+  int RequiredBufferReserve = KILOBYTE(DvbCardWith4MBofSDRAM ? 288 : 576);
 #endif
   active = true;
   while (active) {
 #ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
-        if (needsBufferReserve) {
-           if (IsAttached() && !Cleared) {
-              PlayPes(NULL, 0);
-              Cleared = true;
-              }
+        if (needsBufferReserve && !GotBufferReserve) {
            //XXX For dolby we've to fill the buffer because the firmware does
            //XXX not decode dolby but use a PCM stream for transport, therefore
            //XXX the firmware has not enough buffer for noiseless skipping early
@@ -79,14 +81,12 @@ void cTransfer::Action(void)
            //XXX audio is mostly to early in comparison to video).
            //XXX To resolve this, the remuxer or PlayPes() should synchronize
            //XXX audio with the video frames. 2004/09/09 Werner
-           if (!GotBufferReserve) {
-              if (ringBuffer->Available() < 3 * KILOBYTE(192) / 2) { // used to be MAXFRAMESIZE, but the HDTV value of KILOBYTE(512) is way too much here
-                 cCondWait::SleepMs(20); // allow the buffer to collect some reserve
-                 continue;
-                 }
-              else
-                 GotBufferReserve = true;
+           if (ringBuffer->Available() < RequiredBufferReserve) { // used to be MAXFRAMESIZE, but the HDTV value of KILOBYTE(512) is way too much here
+              cCondWait::SleepMs(20); // allow the buffer to collect some reserve
+              continue;
               }
+           else
+              GotBufferReserve = true;
            }
 #endif
         int Count;
@@ -98,10 +98,14 @@ void cTransfer::Action(void)
               // So let's clear the buffer instead of suffering from permanent
               // overflows.
               dsyslog("clearing transfer buffer to avoid overflows");
+              DeviceClear();
               ringBuffer->Clear();
               remux->Clear();
               PlayPes(NULL, 0);
               p = NULL;
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+              GotBufferReserve = false;
+#endif
               continue;
               }
            Count = remux->Put(b, Count);
@@ -132,7 +136,11 @@ void cTransfer::Action(void)
                  DeviceClear();
                  ringBuffer->Clear();
                  remux->Clear();
+                 PlayPes(NULL, 0);
                  p = NULL;
+#ifdef FW_NEEDS_BUFFER_RESERVE_FOR_AC3
+                 GotBufferReserve = false;
+#endif
                  }
               }
            }