Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick -> #2938

Merged
merged 22 commits into from
Jun 24, 2023
Merged

Cherry pick -> #2938

merged 22 commits into from
Jun 24, 2023

Conversation

jbleyel
Copy link
Contributor

@jbleyel jbleyel commented Jun 11, 2023

@jbleyel jbleyel marked this pull request as draft June 11, 2023 08:10
jbleyel and others added 21 commits June 11, 2023 10:17
* improve fbc
* add resetAdvancedsatposdependsRoot , getRotorAdvancedsatposdependsPosition, setAdvancedsatposdependsRoot, tunerAdvancedsatposdependsInUse, tunerLinkedInUse
* add frontendLastRotorOrbitalPosition/forceUpdateRotorPos
* master: (24 commits)
  [MenuList] * partialy revert aa2c1a7
  add vti workaroud
  [ServiceScan.py] Update after this commit aa2c1a7!
  [dvbci_ccmgr_helper] * Replace call to the non reentrant function "localtime" by a call to "localtime_r".
  ci add ci+ 1.4 support
  [skin.py] Small corrections and adjustments
  [TemplatedMultiContent.py] Sort imports
  [MultiContent.py] Remove unneeded import
  [eListbox] * rename setSpacerColor -> setSpacingColor
  GUI Updates (#2943)
  [Geolocation.py] Code updates (#2950)
  [main] * checkInternetAccess change return codes to:
  [Timers] * remove duplicate getSpace
  Unicable connected (#2949)
  [enigma] (#2947)
  [StackTrace.py] Small code clean up
  multiboot fix slot R target selection for kexecmultiboot
  information.py, multiboot sortslots
  [VideoWizard] * stop timer after press red for language selection
  [VideoWizard] * enable red button for language selection in video wizard
  ...
Newer FBC boxes have more than 8 demuxes today.
But the getNumberOfDemuxes is returning always 8, the sizeof m_used_demux.

Increase the m_used_demux into 32, that seems good enough, since we are naming tuners using A-Z.

The demux_mask would overflow, since 1<<26, doesn't fit anymore to uint8_t so change it to uint32_t.
But keep compatiblity to old 0x82 private descriptor and hash by keeping only the old uint8_t part.
Although we can remove demux_mask, since it's a left over from unsupported dm7025.

Also a new private descriptor 0x86 created that will send only demux index.

(cherry picked from commit a7b7c39337417c25e9fb4abdf478d17215c81b72)
A change in service type (e.g. from live tv to live tv + recording, or from live tv to streaming, etc) does not cause any change in the descrambling process. This means that a new CA PMT command/message is not necessary in this case, so don't build the CA PMT message again. Also, clients like oscam do not use the service_type_mask information at all and thus they just ignore the updated CA PMT message sent.

(cherry picked from commit ab7758ddabee7ebc6d935c8f46187b1a2dcb2b95)
Previously, there was no way to remove a service type from the service_type_mask. Only adding additional service types was possible. While this is not critical since CA PMT is not rebuilt/sent when there is a service type change, enigma should hold the correct service types for each service.

(cherry picked from commit 6a6cd0cb044e06552ee90817d3b20b70dc9c3ca6)
Enigma should send a new CA PMT list, only when a service is completely removed. When a service is "partially" removed (e.g. live tv + recording and the recording is stopped), enigma should send no CA PMT objects at all.

When a new service is added, enigma should send an "ADD" CA PMT object if there are already other services in the list, or an "ONLY" CA PMT object if the new service is the only active one. Previously a complete list of active services was sent.

(cherry picked from commit d76e85748c2a34ba2ac5ce1b7d5b628a9bfe80fc)
* small tidy up
* add missing fcc fix
@jbleyel jbleyel marked this pull request as ready for review June 24, 2023 14:16
@sonarcloud
Copy link

sonarcloud bot commented Jun 24, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 86 Code Smells

No Coverage information No Coverage information
2.5% 2.5% Duplication

@jbleyel jbleyel merged commit 2fb1cd0 into master Jun 24, 2023
4 checks passed
@jbleyel jbleyel deleted the FBC branch June 24, 2023 14:42
jbleyel added a commit that referenced this pull request Jun 28, 2023
* master: (23 commits)
  Revert "add vti workaroud"
  Sync with Pli/Vix (#2938)
  [MenuList] * partialy revert aa2c1a7
  add vti workaroud
  [ServiceScan.py] Update after this commit aa2c1a7!
  [dvbci_ccmgr_helper] * Replace call to the non reentrant function "localtime" by a call to "localtime_r".
  ci add ci+ 1.4 support
  [skin.py] Small corrections and adjustments
  [TemplatedMultiContent.py] Sort imports
  [MultiContent.py] Remove unneeded import
  [eListbox] * rename setSpacerColor -> setSpacingColor
  GUI Updates (#2943)
  [Geolocation.py] Code updates (#2950)
  [main] * checkInternetAccess change return codes to:
  [Timers] * remove duplicate getSpace
  Unicable connected (#2949)
  [enigma] (#2947)
  Changed graphical EPG to only load event data for visible channels.
  [StackTrace.py] Small code clean up
  multiboot fix slot R target selection for kexecmultiboot
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants