Skip to content

VPAAMP-881 Migrate to HEAD of middleware-player-interface - #1815

Open
pstroffolino wants to merge 3 commits into
dev_sprint_25_2from
feature/VPAAMP-881
Open

VPAAMP-881 Migrate to HEAD of middleware-player-interface#1815
pstroffolino wants to merge 3 commits into
dev_sprint_25_2from
feature/VPAAMP-881

Conversation

@pstroffolino

Copy link
Copy Markdown
Contributor

Remove dependency on patched middleware commit bd2b3b1. All required features (setPtsOffset, GStreamer base-1.0 fixes, OpenSSL includes) are now present natively in middleware-player-interface HEAD (0.3.1).

Changes:

  • scripts/install_options.sh: Remove pinned commit bd2b3b1, use HEAD
  • scripts/install_middleware_interfaces.sh: Remove commit checkout logic (sibling and clone paths) and patch application block
  • .github/workflows/L1-tests.yml: Remove git checkout bd2b3b1 and patch application steps; clone HEAD directly
  • test/utests/fakes/CMakeLists.txt: Remove deprecated internal aamp/middleware fallback; FATAL_ERROR if middleware not found
  • test/utests/tests/CommonTestIncludes.cmake: Same - remove deprecated aamp/middleware fallback paths
  • OSX/patches/middleware-fixes-4c1d90a.patch: Archived to OSX/patches/archive/ with README explaining historical context
  • OSX/patches/middleware-build-fixes-summary.md: Updated to note patch is no longer applied (VPAAMP-881)

Verified: macOS clean build succeeds with middleware-player-interface develop branch (0165183, release 0.3.1) without any patches.

Generated with Devin

@pstroffolino
pstroffolino requested a review from a team as a code owner August 1, 2026 16:51
Remove dependency on patched middleware commit bd2b3b1. All required
features (setPtsOffset, GStreamer base-1.0 fixes, OpenSSL includes)
are now present natively in middleware-player-interface HEAD (0.3.1).

Changes:
- scripts/install_options.sh: Remove pinned commit bd2b3b1, use HEAD
- scripts/install_middleware_interfaces.sh: Remove commit checkout
  logic (sibling and clone paths) and patch application block
- .github/workflows/L1-tests.yml: Remove git checkout bd2b3b1 and
  patch application steps; clone HEAD directly
- test/utests/fakes/CMakeLists.txt: Remove deprecated internal
  aamp/middleware fallback; FATAL_ERROR if middleware not found
- test/utests/tests/CommonTestIncludes.cmake: Same - remove
  deprecated aamp/middleware fallback paths
- OSX/patches/middleware-fixes-4c1d90a.patch: Archived to
  OSX/patches/archive/ with README explaining historical context
- OSX/patches/middleware-build-fixes-summary.md: Updated to note
  patch is no longer applied (VPAAMP-881)

Verified: macOS clean build succeeds with middleware-player-interface
develop branch (0165183, release 0.3.1) without any patches.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
@pstroffolino
pstroffolino force-pushed the feature/VPAAMP-881 branch 3 times, most recently from 9af618f to c464372 Compare August 2, 2026 06:09
DrmSession gained four new protected members in middleware develop
(lifecycle guard fix): mLifecycleMutex, mLifecycleCV, mActiveOperations,
mMarkedForDestruction.

The fake DrmSession constructor in FakeAampDRMSessionManager.cpp was
not initializing these members, leaving mActiveOperations as garbage on
Linux/glibc. This caused heap corruption (glibc sysmalloc assertion)
in multi-key and concurrency tests on Linux CI, while macOS passed due
to its more lenient allocator behavior.

Fix:
1. FakeAampDRMSessionManager.cpp: initialize all four new members in
   the fake DrmSession constructor, matching the real DrmSession.cpp.
2. AampDRMLicPreFetcherTestCases.cpp / AampDRMLicManagerTestCases.cpp:
   add ~TestDrmSession() that marks for destruction and waits for
   in-flight operations to drain before delete, mirroring what real
   DrmSessionManager now does for production sessions.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…ally work

The commit ID option was parsed and exported but never used when cloning
middleware-player-interface from GitHub. Added logic to checkout the specified
commit after cloning, with fallback to HEAD if checkout fails. This makes the
option functional as documented.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
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.

1 participant