X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/09d90704f6cae05c67e08d10a46f28b2e2b0b1c7..e7e5b70162a6e74d7ee293495635c79660e0f7a8:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 92652a4b..90bf19e1 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -13,9 +13,11 @@
 #define DMX_PES_VIDEO0 DMX_PES_VIDEO
 #define DMX_PES_AUDIO0 DMX_PES_AUDIO
 #define DMX_PES_PCR0 DMX_PES_PCR
+#define DMX_PES_TELETEXT0 DMX_PES_TELETEXT
 #define DMX_PES_VIDEO1 DMX_PES_VIDEO
 #define DMX_PES_AUDIO1 DMX_PES_AUDIO
 #define DMX_PES_PCR1 DMX_PES_PCR
+#define DMX_PES_TELETEXT1 DMX_PES_TELETEXT
 #include <ost/dmx.h>
 #include <ost/video.h>
 #include <ost/audio.h>
@@ -198,6 +200,9 @@ int eDVBAudio::startPid(int pid, int type)
 	case aAACHE:
 		bypass = 9;
 		break;
+	case aLPCM:
+		bypass = 6;
+		break;
 	}
 
 	eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
@@ -860,7 +865,7 @@ int eTSMPEGDecoder::setState()
 	const char *decoder_states[] = {"stop", "pause", "play", "decoderfastforward", "trickmode", "slowmotion"};
 	eDebug("decoder state: %s, vpid=%d, apid=%d", decoder_states[m_state], m_vpid, m_apid);
 
-	bool changed = !!m_changed;
+	int changed = m_changed;
 #if HAVE_DVB_API_VERSION < 3
 	bool checkAVSync = m_changed & (changeAudio|changeVideo|changePCR);
 	if (m_changed & changeAudio && m_audio)
@@ -898,7 +903,7 @@ int eTSMPEGDecoder::setState()
 	}
 	if (m_changed & changePCR)
 	{
-		m_pcr = new eDVBPCR(m_demux);
+		m_pcr = new eDVBPCR(m_demux, m_decoder);
 		if (m_pcr->setPid(m_pcrpid))
 			res = -1;
 	}
@@ -1002,7 +1007,7 @@ int eTSMPEGDecoder::setState()
 	}
 #endif
 
-	if (m_changed & changeState)
+	if (changed & (changeState|changeVideo|changeAudio))
 	{
 					/* play, slowmotion, fast-forward */
 		int state_table[6][4] = 
@@ -1015,7 +1020,7 @@ int eTSMPEGDecoder::setState()
 				/* [stateSlowMotion] =           */ {1, m_ff_sm_ratio, 0}
 			};
 		int *s = state_table[m_state];
-		if (m_video)
+		if (changed & (changeState|changeVideo) && m_video)
 		{
 			m_video->setSlowMotion(s[1]);
 			m_video->setFastForward(s[2]);
@@ -1024,7 +1029,7 @@ int eTSMPEGDecoder::setState()
 			else
 				m_video->freeze();
 		}
-		if (m_audio)
+		if (changed & (changeState|changeAudio) && m_audio)
 		{
 			if (s[0])
 				m_audio->unfreeze();
@@ -1175,10 +1180,7 @@ RESULT eTSMPEGDecoder::play()
 	{
 		if (!m_changed)
 			return 0;
-	}
-//	else  
-/* commented out because the changeState is needed to unfreeze decoders in decoder::setState... needed by normal pmt changes
-tmbinc please recheck this! */
+	} else  
 	{
 		m_state = statePlay;
 		m_changed |= changeState;