Fixed handling DPID when deciding whether to switch to 'Transfer Mode'

This commit is contained in:
Klaus Schmidinger 2006-02-19 13:53:30 +01:00
parent 47519e0536
commit 8409c68e44
3 changed files with 5 additions and 2 deletions

View File

@ -1316,6 +1316,7 @@ Marco Schl
process the audio data process the audio data
for improving OSD area handling in cDvbSpuDecoder for improving OSD area handling in cDvbSpuDecoder
for suggesting to log the description (if present) in case a thread is canceled for suggesting to log the description (if present) in case a thread is canceled
for fixing handling DPID when deciding whether to switch to 'Transfer Mode'
Jürgen Schmitz <j.schmitz@web.de> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

View File

@ -4353,3 +4353,5 @@ Video Disk Recorder Revision History
in case this is a replay session (based on a patch from Rolf Ahrenberg). in case this is a replay session (based on a patch from Rolf Ahrenberg).
- If a recording starts and the channel's audio PID data has more language code - If a recording starts and the channel's audio PID data has more language code
information than the EPG's component data, the code from the channel is taken. information than the EPG's component data, the code from the channel is taken.
- Fixed handling DPID when deciding whether to switch to 'Transfer Mode' (thanks
to Marco Schlüßler).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: dvbdevice.c 1.152 2006/02/04 10:21:51 kls Exp $ * $Id: dvbdevice.c 1.153 2006/02/19 13:52:04 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -811,7 +811,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
); );
bool StartTransferMode = IsPrimaryDevice() && !DoTune bool StartTransferMode = IsPrimaryDevice() && !DoTune
&& (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || pidHandles[ptAudio].pid != Channel->Apid(0))// the PID is already set as DMX_PES_OTHER && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || (pidHandles[ptAudio].pid != Channel->Apid(0) && (Channel->Dpid(0) ? pidHandles[ptAudio].pid != Channel->Dpid(0) : true)))// the PID is already set as DMX_PES_OTHER
|| !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
); );