mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
Only compile-tested.
This commit is contained in:
Stefan Seyfried
2013-11-13 14:04:15 +01:00
parent 3a728f9ee1 2eacae9ca7
commit 548448456a
56 changed files with 1278 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/record.cpp
View File

@@ -176,8 +176,11 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
psi.addPid(recMovieInfo->audioPids[i].epgAudioPid, EN_TYPE_AUDIO_EAC3, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str());
}else
psi.addPid(recMovieInfo->audioPids[i].epgAudioPid, EN_TYPE_AUDIO, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str());
if (numpids >= REC_MAX_APIDS)
break;
}
if ((StreamVTxtPid) && (allpids.PIDs.vtxtpid != 0)){
if ((StreamVTxtPid) && (allpids.PIDs.vtxtpid != 0) && (numpids < REC_MAX_APIDS)){
apids[numpids++] = allpids.PIDs.vtxtpid;
psi.addPid(allpids.PIDs.vtxtpid, EN_TYPE_TELTEX, 0, channel->getTeletextLang());
}
@@ -187,6 +190,8 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
if (s->thisSubType == CZapitAbsSub::DVB) {
if(i>9)//max sub pids
break;
if (numpids >= REC_MAX_APIDS)
break;
CZapitDVBSub* sd = reinterpret_cast<CZapitDVBSub*>(s);
apids[numpids++] = sd->pId;
@@ -197,9 +202,10 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
}
psi.genpsi(fd);
if ((StreamPmtPid) && (allpids.PIDs.pmtpid != 0))
#if 0
if ((StreamPmtPid) && (allpids.PIDs.pmtpid != 0) && (numpids < REC_MAX_APIDS))
apids[numpids++] = allpids.PIDs.pmtpid;
#endif
if(record == NULL)
record = new cRecord(channel->getRecordDemux() /*RECORD_DEMUX*/);
@@ -318,6 +324,9 @@ bool CRecordInstance::Update()
if(!found) {
update = true;
printf("%s: apid %x not found in recording pids\n", __FUNCTION__, it->apid);
if (numpids < REC_MAX_APIDS)
apids[numpids++] = it->apid;
record->AddPid(it->apid);
for(unsigned int i = 0; i < allpids.APIDs.size(); i++) {
if(allpids.APIDs[i].pid == it->apid) {