X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fdecoder.cpp;h=8ed9f43f5fed4c56788547734b3da485fbe8b45a;hb=b562d5a27a432cad7e208170f980964cb6099da5;hp=710cc421ec59a6a476249c8bd6917df35639e7fc;hpb=4e8904ef73e3ce5e275a1f5fbf369c4f9dab648e;p=vuplus_dvbapp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 710cc42..8ed9f43 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -203,6 +203,9 @@ int eDVBAudio::startPid(int pid, int type)
 	case aLPCM:
 		bypass = 6;
 		break;
+	case aDTSHD:
+		bypass = 0x10;
+		break;
 	}
 
 	eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
@@ -601,7 +604,7 @@ RESULT eDVBVideo::connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEve
 	return 0;
 }
 
-static int readMpegProc(char *str, int decoder)
+static int readMpegProc(const char *str, int decoder)
 {
 	int val = -1;
 	char tmp[64];
@@ -1045,9 +1048,9 @@ int eTSMPEGDecoder::setState()
 int eTSMPEGDecoder::m_pcm_delay=-1,
 	eTSMPEGDecoder::m_ac3_delay=-1;
 
-RESULT eTSMPEGDecoder::setPCMDelay(int delay)
+RESULT eTSMPEGDecoder::setHwPCMDelay(int delay)
 {
-	if (m_decoder == 0 && delay != m_pcm_delay )
+	if (delay != m_pcm_delay )
 	{
 		FILE *fp = fopen("/proc/stb/audio/audio_delay_pcm", "w");
 		if (fp)
@@ -1061,9 +1064,9 @@ RESULT eTSMPEGDecoder::setPCMDelay(int delay)
 	return -1;
 }
 
-RESULT eTSMPEGDecoder::setAC3Delay(int delay)
+RESULT eTSMPEGDecoder::setHwAC3Delay(int delay)
 {
-	if ( m_decoder == 0 && delay != m_ac3_delay )
+	if ( delay != m_ac3_delay )
 	{
 		FILE *fp = fopen("/proc/stb/audio/audio_delay_bitstream", "w");
 		if (fp)
@@ -1077,6 +1080,17 @@ RESULT eTSMPEGDecoder::setAC3Delay(int delay)
 	return -1;
 }
 
+
+RESULT eTSMPEGDecoder::setPCMDelay(int delay)
+{
+	return m_decoder == 0 ? setHwPCMDelay(delay) : -1;
+}
+
+RESULT eTSMPEGDecoder::setAC3Delay(int delay)
+{
+	return m_decoder == 0 ? setHwAC3Delay(delay) : -1;
+}
+
 eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder)
 	: m_demux(demux), 
 		m_vpid(-1), m_vtype(-1), m_apid(-1), m_atype(-1), m_pcrpid(-1), m_textpid(-1),