add possibility to set per service ac3/pcm delay (not yet via gui)

to set a pcm or ac3 delay for a specific service edit your servicelist
(/etc/enigma2/lamedb)
example for pcm delay:

6dca:00c00000:044d:0001:1:0
Das Erste
p:ARD,c:000065,c:010066,c:020068,c:030065,c:060001,c:080060 <-- 0x60 = 96ms PCM delay

for AC3 delay set, c:07xxxx

5 files changed, 90 insertions, 34 deletions

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 362289f3..a05c837c 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -530,6 +530,37 @@ int eTSMPEGDecoder::setState()
 	return res;
 }
 
+int eTSMPEGDecoder::m_pcm_delay=-1,
+	eTSMPEGDecoder::m_ac3_delay=-1;
+
+RESULT eTSMPEGDecoder::setPCMDelay(int delay)
+{
+	if (m_decoder == 0 && delay != m_pcm_delay )
+	{
+		FILE *fp = fopen("/proc/stb/audio/audio_delay_pcm", "w");
+		if (fp)
+		{
+			fprintf(fp, "%x", delay*90);
+			fclose(fp);
+			m_pcm_delay = delay;
+		}
+	}
+}
+
+RESULT eTSMPEGDecoder::setAC3Delay(int delay)
+{
+	if ( m_decoder == 0 && delay != m_ac3_delay )
+	{
+		FILE *fp = fopen("/proc/stb/audio/audio_delay_bitstream", "w");
+		if (fp)
+		{
+			fprintf(fp, "%x", delay*90);
+			fclose(fp);
+			m_ac3_delay = delay;
+		}
+	}
+}
+
 eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0), m_decoder(decoder)
 {
 	demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event);
@@ -565,15 +596,30 @@ RESULT eTSMPEGDecoder::setAudioPID(int apid, int type)
 	return 0;
 }
 
+int eTSMPEGDecoder::m_audio_channel = -1;
+
 RESULT eTSMPEGDecoder::setAudioChannel(int channel)
 {
-	if (m_audio)
-		m_audio->setChannel(channel);
-	else
-		eDebug("eTSMPEGDecoder::setAudioChannel but no audio decoder exist");
+	if (channel == -1)
+		channel = ac_stereo;
+	if (m_decoder == 0 && m_audio_channel != channel)
+	{
+		if (m_audio)
+		{
+			m_audio->setChannel(channel);
+			m_audio_channel=channel;
+		}
+		else
+			eDebug("eTSMPEGDecoder::setAudioChannel but no audio decoder exist");
+	}
 	return 0;
 }
 
+int eTSMPEGDecoder::getAudioChannel()
+{
+	return m_audio_channel == -1 ? ac_stereo : m_audio_channel;
+}
+
 RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
 {
 	if (m_pcrpid != pcrpid)
diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 554d8c1b..b50a605b 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -82,6 +82,9 @@ public:
 
 class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
 {
+	static int m_pcm_delay;
+	static int m_ac3_delay;
+	static int m_audio_channel;
 DECLARE_REF(eTSMPEGDecoder);
 private:
 	ePtr<eDVBDemux> m_demux;
@@ -110,6 +113,11 @@ public:
 	RESULT setVideoPID(int vpid, int type);
 	RESULT setAudioPID(int apid, int type);
 	RESULT setAudioChannel(int channel);
+	int getAudioChannel();
+	RESULT setPCMDelay(int delay);
+	int getPCMDelay() { return m_pcm_delay; }
+	RESULT setAC3Delay(int delay);
+	int getAC3Delay() { return m_ac3_delay; }
 	RESULT setSyncPCR(int pcrpid);
 	RESULT setTextPID(int textpid);
 	RESULT setSyncMaster(int who);
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 8bbbaafa..69342717 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -234,7 +234,8 @@ class eDVBService: public iStaticServiceInformation
 public:
 	enum cacheID
 	{
-		cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cVTYPE, cACHANNEL, cacheMax
+		cVPID, cAPID, cTPID, cPCRPID, cAC3PID,
+		cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY, cacheMax
 	};
 
 	int getCacheEntry(cacheID);
@@ -594,6 +595,12 @@ public:
 	enum { ac_left, ac_stereo, ac_right };
 		/** Set Displayed Audio Channel */
 	virtual RESULT setAudioChannel(int channel)=0;
+	virtual int getAudioChannel()=0;
+
+	virtual RESULT setPCMDelay(int delay)=0;
+	virtual int getPCMDelay()=0;
+	virtual RESULT setAC3Delay(int delay)=0;
+	virtual int getAC3Delay()=0;
 
 		/** Set Displayed Videotext PID */
 	virtual RESULT setTextPID(int vpid)=0;
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index d0119508..d6f002e6 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -160,27 +160,27 @@ PyObject *eDVBServicePMTHandler::getCaIds()
 int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 {
 	ePtr<eTable<ProgramMapSection> > ptr;
+	int cached_apid_ac3 = -1;
+	int cached_apid_mpeg = -1;
+	int cached_vpid = -1;
+	int cached_tpid = -1;
 
 	program.videoStreams.clear();
 	program.audioStreams.clear();
 	program.pcrPid = -1;
 	program.pmtPid = -1;
 	program.textPid = -1;
-	program.audioChannel = m_service ? m_service->getCacheEntry(eDVBService::cACHANNEL) : -1;
+
+	if ( m_service && !m_service->cacheEmpty() )
+	{
+		cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
+		cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAC3PID);
+		cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAPID);
+		cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
+	}
 
 	if ( ((m_service && m_service->usePMT()) || !m_service) && !m_PMT.getCurrent(ptr))
 	{
-		int cached_apid_ac3 = -1;
-		int cached_apid_mpeg = -1;
-		int cached_vpid = -1;
-		int cached_tpid = -1;
-		if ( m_service && !m_service->cacheEmpty() )
-		{
-			cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
-			cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAC3PID);
-			cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAPID);
-			cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
-		}
 		eDVBTableSpec table_spec;
 		ptr->getSpec(table_spec);
 		program.pmtPid = table_spec.pid < 0x1fff ? table_spec.pid : -1;
@@ -313,48 +313,44 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 		return 0;
 	} else if ( m_service && !m_service->cacheEmpty() )
 	{
-		int vpid = m_service->getCacheEntry(eDVBService::cVPID),
-			apid_ac3 = m_service->getCacheEntry(eDVBService::cAC3PID),
-			apid_mpeg = m_service->getCacheEntry(eDVBService::cAPID),
-			pcrpid = m_service->getCacheEntry(eDVBService::cPCRPID),
-			tpid = m_service->getCacheEntry(eDVBService::cTPID),
+		int cached_pcrpid = m_service->getCacheEntry(eDVBService::cPCRPID),
 			vpidtype = m_service->getCacheEntry(eDVBService::cVTYPE),
 			cnt=0;
 		if ( vpidtype == -1 )
 			vpidtype = videoStream::vtMPEG2;
-		if ( vpid != -1 )
+		if ( cached_vpid != -1 )
 		{
 			videoStream s;
-			s.pid = vpid;
+			s.pid = cached_vpid;
 			s.type = vpidtype;
 			program.videoStreams.push_back(s);
 			++cnt;
 		}
-		if ( apid_ac3 != -1 )
+		if ( cached_apid_ac3 != -1 )
 		{
 			audioStream s;
 			s.type = audioStream::atAC3;
-			s.pid = apid_ac3;
+			s.pid = cached_apid_ac3;
 			program.audioStreams.push_back(s);
 			++cnt;
 		}
-		if ( apid_mpeg != -1 )
+		if ( cached_apid_mpeg != -1 )
 		{
 			audioStream s;
 			s.type = audioStream::atMPEG;
-			s.pid = apid_mpeg;
+			s.pid = cached_apid_mpeg;
 			program.audioStreams.push_back(s);
 			++cnt;
 		}
-		if ( pcrpid != -1 )
+		if ( cached_pcrpid != -1 )
 		{
 			++cnt;
-			program.pcrPid = pcrpid;
+			program.pcrPid = cached_pcrpid;
 		}
-		if ( tpid != -1 )
+		if ( cached_tpid != -1 )
 		{
 			++cnt;
-			program.textPid = tpid;
+			program.textPid = cached_tpid;
 		}
 		CAID_LIST &caids = m_service->m_ca;
 		for (CAID_LIST::iterator it(caids.begin()); it != caids.end(); ++it)
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 57176d1f..fc8b15dd 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -122,9 +122,8 @@ public:
 		int pmtPid;
 		int textPid;
 		bool isCrypted() { return !caids.empty(); }
-		int audioChannel;
 	};
-	
+
 	int getProgramInfo(struct program &program);
 	int getDataDemux(ePtr<iDVBDemux> &demux);
 	int getDecodeDemux(ePtr<iDVBDemux> &demux);