mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix record/stream AC3 logic

Browse Source 
Origin commit data
------------------
Commit: 34d8244a80
Author: TangoCash <eric@loxat.de>
Date: 2021-04-04 (Sun, 04 Apr 2021)
This commit is contained in:
TangoCash
2021-04-04 10:19:51 +02:00
committed by vanhofen
parent 4f49adefe6
commit be48454706
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/genpsi.cpp
View File

@@ -148,11 +148,7 @@ void CGenPsi::addPid(uint16_t pid, uint16_t pidtype, short isAC3, const char *da
break; break;
case EN_TYPE_AUDIO: case EN_TYPE_AUDIO:
apid[nba]=pid; apid[nba]=pid;
#if HAVE_CST_HARDWARE
atypes[nba]=isAC3; atypes[nba]=isAC3;
#else
atypes[nba]=!isAC3;
#endif
if(data != NULL){ if(data != NULL){
apid_lang[nba][0] = data[0]; apid_lang[nba][0] = data[0];
apid_lang[nba][1] = data[1]; apid_lang[nba][1] = data[1];

8
src/driver/record.cpp
View File

@@ -234,16 +234,16 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel)
apids[numpids++] = recMovieInfo->audioPids[i].AudioPid; apids[numpids++] = recMovieInfo->audioPids[i].AudioPid;
switch (channel->getAudioChannel(i)->audioChannelType) { switch (channel->getAudioChannel(i)->audioChannelType) {
case CZapitAudioChannel::EAC3: case CZapitAudioChannel::EAC3:
psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO_EAC3, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO_EAC3, 0, channel->getAudioChannel(i)->description.c_str());
break; break;
case CZapitAudioChannel::AAC: case CZapitAudioChannel::AAC:
psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO_AAC, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO_AAC, 0, channel->getAudioChannel(i)->description.c_str());
break; break;
case CZapitAudioChannel::AACPLUS: case CZapitAudioChannel::AACPLUS:
psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO_AACP, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO_AACP, 0, channel->getAudioChannel(i)->description.c_str());
break; break;
default: default:
psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO, recMovieInfo->audioPids[i].atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(recMovieInfo->audioPids[i].AudioPid, EN_TYPE_AUDIO, (recMovieInfo->audioPids[i].atype == CZapitAudioChannel::AC3), channel->getAudioChannel(i)->description.c_str());
break; break;
} }

8
src/driver/streamts.cpp
View File

@@ -489,13 +489,13 @@ void CStreamManager::AddPids(int fd, CZapitChannel *channel, stream_pids_t &pids
CZapitAudioChannel::ZapitAudioChannelType atype = channel->getAudioChannel(i)->audioChannelType; CZapitAudioChannel::ZapitAudioChannelType atype = channel->getAudioChannel(i)->audioChannelType;
printf("CStreamManager::AddPids: genpsi apid %x (%d)\n", *it, atype); printf("CStreamManager::AddPids: genpsi apid %x (%d)\n", *it, atype);
if (channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::EAC3) { if (channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::EAC3) {
psi.addPid(*it, EN_TYPE_AUDIO_EAC3, atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(*it, EN_TYPE_AUDIO_EAC3, 0, channel->getAudioChannel(i)->description.c_str());
} else if (channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::AAC) { } else if (channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::AAC) {
psi.addPid(*it, EN_TYPE_AUDIO_AAC, atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(*it, EN_TYPE_AUDIO_AAC, 0, channel->getAudioChannel(i)->description.c_str());
} else if (channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::AACPLUS) { } else if (channel->getAudioChannel(i)->audioChannelType == CZapitAudioChannel::AACPLUS) {
psi.addPid(*it, EN_TYPE_AUDIO_AACP, atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(*it, EN_TYPE_AUDIO_AACP, 0, channel->getAudioChannel(i)->description.c_str());
} else { } else {
psi.addPid(*it, EN_TYPE_AUDIO, atype, channel->getAudioChannel(i)->description.c_str()); psi.addPid(*it, EN_TYPE_AUDIO, (atype == CZapitAudioChannel::AC3), channel->getAudioChannel(i)->description.c_str());
} }
} }
} }