WIP: Feat/firebolt cpp entos upgrade - #155
Open
brendanobra wants to merge 3 commits into
Open
Conversation
added 2 commits
May 16, 2026 06:38
…boltAccessor Port player-interface Firebolt integration from the legacy firebolt-native-aamp-sdk to the new firebolt-entos-runtime-apis (firebolt-cpp-entos-ext Yocto recipe). Changes: - externals/CMakeLists.txt: find_package(FireboltAamp) -> find_package(FireboltEntOs) + find_package(FireboltTransport); remove -lFireboltSDK; link new cmake targets - externals/IFirebolt/FireboltInterface.h: include firebolt/entos/firebolt.h - externals/IFirebolt/FireboltInterface.cpp: IFireboltAampAccessor -> EntOs::IFireboltAccessor - externals/contentsecuritymanager/IFirebolt/ContentProtectionFirebolt.cpp: same migration - externals/rdk/IFirebolt/DeviceFireboltInterface.cpp: same migration
…DK v2 API - FireboltInterface.cpp: replace Initialize(json)+Connect(cb) with Connect(cfg,cb); remove mListenerId; Disconnect() takes no args - FireboltInterface.h: remove mListenerId member - DeviceFireboltInterface.cpp: Firebolt::Device -> Firebolt::EntOs::Device; ResolutionHandlerFirebolt uses Device::Resolution& (not std::string&)
Contributor
There was a problem hiding this comment.
Pull request overview
This PR upgrades the Firebolt C++ SDK integration from the legacy fireboltaamp/Firebolt::IFireboltAampAccessor API to the new EntOs-based API (firebolt/entos/firebolt.h / Firebolt::EntOs::IFireboltAccessor). It touches the Firebolt interface bootstrap, the device-events interface, the content-protection interface, and the CMake build wiring.
Changes:
- Replace
IFireboltAampAccessorwithFirebolt::EntOs::IFireboltAccessorand update type references (Firebolt::Device::*→Firebolt::EntOs::Device::*, same forContentProtection), including aResolutiontype that is no longer astd::string. - Rework
CreateFireboltInstanceto use the newFirebolt::Configstruct + singleConnect(cfg, callback)call, removing the separateInitializestep and themListenerIdmember used by the previousDisconnect(id)API. - Update
externals/CMakeLists.txtto dropFireboltAampand link againstFireboltTransport+FireboltEntOsinstead, removing duplicate manual-lFireboltSDKappends.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| externals/IFirebolt/FireboltInterface.h | Switch header include to entos firebolt; remove now-unused mListenerId member. |
| externals/IFirebolt/FireboltInterface.cpp | Rewrite CreateFireboltInstance for new Connect(cfg, callback) API; update Disconnect and destructor to entos accessor. |
| externals/rdk/IFirebolt/DeviceFireboltInterface.cpp | Update device event handlers and accessor calls to Firebolt::EntOs::Device::* types; replace string resolution with Resolution struct. |
| externals/contentsecuritymanager/IFirebolt/ContentProtectionFirebolt.cpp | Update content-protection accessor and enum references to Firebolt::EntOs::ContentProtection::*. |
| externals/CMakeLists.txt | Replace FireboltAamp package/link with FireboltTransport + FireboltEntOs; drop redundant -lFireboltSDK appends. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…FireboltEntos.so)
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Comments suppressed due to low confidence (1)
externals/rdk/IFirebolt/DeviceFireboltInterface.cpp:269
videoResolution()is indexed at[0]/[1]without verifying the returned container has at least 2 elements. If the API returns an empty/short value, this will read out of bounds and can crash. Guard on the size and avoid repeatedvalue()calls.
auto curr_network = Firebolt::EntOs::IFireboltAccessor::Instance().DeviceInterface().videoResolution();
if(curr_network)
{
std::shared_ptr<PlayerExternalsRdkInterface> pInstance = PlayerExternalsRdkInterface::GetPlayerExternalsRdkInterfaceInstance();
width = curr_network.value()[0];
height = curr_network.value()[1];
pInstance->SetResolution(width, height);
MW_LOG_INFO("Updating resolution [%d][%d]", curr_network.value()[0], curr_network.value()[1]);
Comment on lines
+254
to
+259
| static void ResolutionHandlerFirebolt(const Firebolt::EntOs::Device::Resolution& t_res) | ||
| { | ||
| int width = 1280; | ||
| int height = 720; | ||
|
|
||
| MW_LOG_INFO("Resolution: %s", t_res.c_str()); | ||
| MW_LOG_INFO("Resolution changed"); |
Comment on lines
182
to
186
| if(CMAKE_USE_SECCLIENT OR CMAKE_USE_SECMANAGER) | ||
| find_package(FireboltAamp CONFIG REQUIRED) | ||
| target_link_libraries(playerfbinterface FireboltAamp::FireboltAamp) | ||
| find_package(FireboltTransport CONFIG REQUIRED) | ||
| find_package(FireboltEntos CONFIG REQUIRED) | ||
| target_link_libraries(playerfbinterface FireboltTransport::FireboltTransport FireboltEntos::FireboltEntos) | ||
| endif() |
Comment on lines
+78
to
+80
| mIsConnected = false; | ||
| MW_LOG_ERR("CreateFireboltInstance url: %s", url.c_str()); | ||
| Firebolt::Error errorConnect = Firebolt::EntOs::IFireboltAccessor::Instance().Connect(cfg, callback); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.