31 replies to this topic

[orizatriznyak]

It seems like auto language selection is not working if the prefered language only exists in AAC format.

Image version: 2015-04-25

Please solve the problem.

[athoik]

Could please tell us on witch sattelite channel this occurs? Or it is happening on stream?

[orizatriznyak]

Amos at 4.0W, channels of T-Home package.

[athoik]

Maybe it is not working because we do not set CacheEntry for AAC. Also there is no cacheID for AAC.

 

        if (m_dvb_service && ((i != -1) || (program.audioStreams.size() == 1)
                || ((m_dvb_service->getCacheEntry(eDVBService::cMPEGAPID) == -1)
                && (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)== -1)
                && (m_dvb_service->getCacheEntry(eDVBService::cDDPPID)== -1)
                && (m_dvb_service->getCacheEntry(eDVBService::cAACHEAPID) == -1))))
        {
                m_dvb_service->setCacheEntry(eDVBService::cMPEGAPID, apidtype == eDVBAudio::aMPEG ? apid : -1);
                m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apidtype == eDVBAudio::aAC3 ? apid : -1);
                m_dvb_service->setCacheEntry(eDVBService::cDDPPID, apidtype == eDVBAudio::aDDP ? apid : -1);
                m_dvb_service->setCacheEntry(eDVBService::cAACHEAPID, apidtype == eDVBAudio::aAACHE ? apid : -1);
        }
 
....
 
        enum cacheID
        {
                cVPID, cMPEGAPID, cTPID, cPCRPID, cAC3PID,
                cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY,
                cSUBTITLE, cAACHEAPID=12, cDDPPID, cacheMax
        };

 

@OpenPLi Is correct to add cAACPID? And what value we should use?

[Dimitrij]

http://forums.openpl...che#entry450158

[athoik]

Maybe you had to increase also autoaudio_level to 5 (in lib/dvb/pmt.cpp)?

-                int autoaudio_level = 4;
+                int autoaudio_level = 5;

Also your patch now does not apply so you have to recreate on top of latest changes.

[Dimitrij]

Maybe you had to increase also autoaudio_level to 5 (in lib/dvb/pmt.cpp)?

-                int autoaudio_level = 4;
+                int autoaudio_level = 5;

Also your patch now does not apply so you have to recreate on top of latest changes.

You could create a new patch?
I do not have Linux operating system to check the patch.

[athoik]

 

Maybe you had to increase also autoaudio_level to 5 (in lib/dvb/pmt.cpp)?

-                int autoaudio_level = 4;
+                int autoaudio_level = 5;

Also your patch now does not apply so you have to recreate on top of latest changes.

You could create a new patch?
I do not have Linux operating system to check the patch.

 

 

Is there a way to test it (any FTA channel on 9E or 13E with AAC)?

[Dimitrij]

 

Is there a way to test it (any FTA channel on 9E or 13E with AAC)?

 

It seems only iptv.

Edited by Dimitrij, 4 May 2015 - 07:40.

[Erik Slagter]

Maybe it is not working because we do not set CacheEntry for AAC. Also there is no cacheID for AAC.

That's probably because aac is not allowed in DVB

[Rob van der Does]

That's probably because aac is not allowed in DVB

Are you sure? According to  en_300468v010901p.pdf   1.2MB   2 downloads it is part of the DVB-standard, and if I'm to believe https://en.wikipedia...eo_Broadcasting it's actually being used in some countries for DVB-T.

But I'm far from an expert in this area, so I might have misinterpreted the text.

[Dimitrij]

It's easy to add.

[Erik Slagter]

DVB-T maybe, who knows. Then it may be worth to add it.

[athoik]

DVB-T maybe, who knows. Then it may be worth to add it.

 
Here is the code for latest HEAD.
 

Subject: [PATCH] Cache AAC pid in lamedb


diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index d5575ac..5c28e7a 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -275,7 +275,7 @@ public:
 	{
 		cVPID, cMPEGAPID, cTPID, cPCRPID, cAC3PID,
 		cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY,
-		cSUBTITLE, cAACHEAPID=12, cDDPPID, cacheMax
+		cSUBTITLE, cAACHEAPID=12, cDDPPID, cAACAPID, cacheMax
 	};
 
 	int getCacheEntry(cacheID);
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index ceddf0a..b6f71ba 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -360,6 +360,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 	int cached_apid_ddp = -1;
 	int cached_apid_mpeg = -1;
 	int cached_apid_aache = -1;
+	int cached_apid_aac = -1;
 	int cached_vpid = -1;
 	int cached_tpid = -1;
 	int ret = -1;
@@ -380,6 +381,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 		cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAC3PID);
 		cached_apid_ddp = m_service->getCacheEntry(eDVBService::cDDPPID);
 		cached_apid_aache = m_service->getCacheEntry(eDVBService::cAACHEAPID);
+		cached_apid_aac = m_service->getCacheEntry(eDVBService::cAACAPID);
 		cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
 	}
 
@@ -392,6 +394,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 		int autoaudio_ac3 = -1;
 		int autoaudio_ddp = -1;
 		int autoaudio_aache = -1;
+		int autoaudio_aac = -1;
 		int autoaudio_level = 4;
 
 		std::string configvalue;
@@ -454,7 +457,8 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 			if (program.audioStreams[i].pid == cached_apid_ac3
 			 || program.audioStreams[i].pid == cached_apid_ddp
 			 || program.audioStreams[i].pid == cached_apid_mpeg
-			 || program.audioStreams[i].pid == cached_apid_aache)
+			 || program.audioStreams[i].pid == cached_apid_aache
+			 || program.audioStreams[i].pid == cached_apid_aac)
 			{
 				/* if we find the cached pids, this will be our default stream */
 				audio_cached = i;
@@ -463,7 +467,8 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 			if ((program.audioStreams[i].type != audioStream::atMPEG) && ((first_non_mpeg == -1)
 				|| (program.audioStreams[i].pid == cached_apid_ac3)
 				|| (program.audioStreams[i].pid == cached_apid_ddp)
-				|| (program.audioStreams[i].pid == cached_apid_aache)))
+				|| (program.audioStreams[i].pid == cached_apid_aache)
+				|| (program.audioStreams[i].pid == cached_apid_aac)))
 			{
 				first_non_mpeg = i;
 			}
@@ -482,6 +487,8 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 							autoaudio_ddp = i;
 						else if (program.audioStreams[i].type == audioStream::atAACHE && (autoaudio_level > x || autoaudio_aache == -1))
 							autoaudio_aache = i;
+						else if (program.audioStreams[i].type == audioStream::atAAC && (autoaudio_level > x || autoaudio_aac == -1))
+							autoaudio_aac = i;
 						autoaudio_level = x;
 						break;
 					}
@@ -540,6 +547,8 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 				program.defaultAudioStream = autoaudio_ddp;
 			else if (autoaudio_aache != -1)
 				program.defaultAudioStream = autoaudio_aache;
+			else if (autoaudio_aac != -1)
+				program.defaultAudioStream = autoaudio_aac;
 			else if (first_non_mpeg != -1)
 				program.defaultAudioStream = first_non_mpeg;
 		}
@@ -626,6 +635,15 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 			program.audioStreams.push_back(s);
 			++cnt;
 		}
+		if ( cached_apid_aac != -1 )
+		{
+			audioStream s;
+			s.type = audioStream::atAAC;
+			s.pid = cached_apid_aac;
+			s.rdsPid = -1;
+			program.audioStreams.push_back(s);
+			++cnt;
+		}
 		if ( cached_apid_mpeg != -1 )
 		{
 			audioStream s;
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 29f7975..9c9a560 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1979,6 +1979,9 @@ int eDVBServicePlay::getInfo(int w)
 			apid = m_dvb_service->getCacheEntry(eDVBService::cAACHEAPID);
 			if (apid != -1)
 				return apid;
+			apid = m_dvb_service->getCacheEntry(eDVBService::cAACAPID);
+			if (apid != -1)
+				return apid;
 		}
 		if (no_program_info) return -1; if (program.audioStreams.empty()) return -1; return program.audioStreams[0].pid;
 	case sPCRPID:
@@ -2206,12 +2209,14 @@ int eDVBServicePlay::selectAudioStream(int i)
 		|| ((m_dvb_service->getCacheEntry(eDVBService::cMPEGAPID) == -1)
 		&& (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)== -1)
 		&& (m_dvb_service->getCacheEntry(eDVBService::cDDPPID)== -1)
-		&& (m_dvb_service->getCacheEntry(eDVBService::cAACHEAPID) == -1))))
+		&& (m_dvb_service->getCacheEntry(eDVBService::cAACHEAPID) == -1)
+		&& (m_dvb_service->getCacheEntry(eDVBService::cAACAPID) == -1))))
 	{
 		m_dvb_service->setCacheEntry(eDVBService::cMPEGAPID, apidtype == eDVBAudio::aMPEG ? apid : -1);
 		m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apidtype == eDVBAudio::aAC3 ? apid : -1);
 		m_dvb_service->setCacheEntry(eDVBService::cDDPPID, apidtype == eDVBAudio::aDDP ? apid : -1);
 		m_dvb_service->setCacheEntry(eDVBService::cAACHEAPID, apidtype == eDVBAudio::aAACHE ? apid : -1);
+		m_dvb_service->setCacheEntry(eDVBService::cAACAPID, apidtype == eDVBAudio::aAAC ? apid : -1);
 	}
 
 	h.resetCachedProgram();
--  

I test that compiles successfully. I cannot test if it works cause I do not have an access to such dvb-t/s program.

(We might need to adapt ptmparse.cpp if it uses different service type than 0x0f, dvbsnoop output might help here?)

[Dimitrij]

athoik

It is not necessary?

 

http://forums.openpl...ndpost&p=489884

You can compile binaries еnigma  for et8000?

[athoik]

No autoaudio level should be 4 (auto1 to auto4).

I guess OpenPLi will commit this one, if not I will compile it.

[Erik Slagter]

It seems there already is an entry for aac-he, why isn't that simply aac actually?

[janejak]

In norway on DVB-T/T2 use MPEG-4, AAC-HE / AC3

[Dimitrij]

Amos at 4.0W, channels of T-Home package

[athoik]

PS. I forgot to upload patch...

Attached Files

•  0001-Cache-AAC-pid-in-lamedb.patch   5.33KB   17 downloads