Skip to content

VPAAMP-22 [VIPA] AAMP returns duplicate CC text tracks on intra-asset encrypted assets - #1277

Merged
pstroffolino merged 21 commits into
dev_sprint_25_2from
feature/vpaamp-22
Oct 26, 2026
Merged

pstroffolino merged 21 commits into
dev_sprint_25_2from
feature/vpaamp-22

Conversation

@cpc005

@cpc005 cpc005 commented Apr 7, 2026 •

Copy link
Copy Markdown
Contributor

Reason for change: Multiple adaption sets each has same CC lang. Results in same CC lang being listed in EPG multiple times.

  • Only add CC track to vector if it has not already been added.
  • Add L1 test using manifest where problem initially seen.

Patrick Conduit added 2 commits April 2, 2026 17:21
@cpc005
cpc005 requested a review from a team as a code owner April 7, 2026 09:51
@cpc005

cpc005 commented Apr 7, 2026

Copy link
Copy Markdown
Contributor Author

@copilot Please review this code change.

Copilot AI commented Apr 7, 2026

Copy link
Copy Markdown
Contributor

@copilot Please review this code change.

Reviewed the changes. Found a bug: in two places std::move(schemeId) was used to construct TextTrackInfo, but then schemeId.c_str() was referenced in the log message that follows — after the move, schemeId is an empty string so the log output would be incorrect. Fixed in 2a6b176 by changing to a copy instead of move in both locations (since schemeId is a loop-scoped local, the performance difference is negligible).

Also fixed the indentation of the continuation line in one of the AAMPLOG_INFO calls to be consistent with the style used elsewhere.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR addresses duplicate closed-caption (CC) text tracks being reported for DASH (MPD) assets when multiple video AdaptationSets expose the same CC language, which caused repeated CC entries (e.g., in EPG/UI).

Changes:

  • Add uniqueness filtering when collecting CC TextTrackInfo entries so identical CC tracks are not duplicated.
  • Add functional tests covering manifests with repeated CC language entries across multiple AdaptationSets.
  • Minor whitespace cleanup in existing test code/comments.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
fragmentcollector_mpd.h Declares helper for adding text tracks only when unique.
fragmentcollector_mpd.cpp Implements uniqueness helper and uses it during CC accessibility parsing.
test/utests/tests/StreamAbstractionAAMP_MPD/FunctionalTests.cpp Adds new L1 functional tests validating CC track de-duplication behavior.

Comment thread test/utests/tests/StreamAbstractionAAMP_MPD/FunctionalTests.cpp Outdated
Comment thread fragmentcollector_mpd.h Outdated
pstroffolino and others added 12 commits April 13, 2026 15:33
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@cpc005
cpc005 requested a balanced review from Copilot October 21, 2026 14:20

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

A missing comment opener in the header prevents compilation.

1 open issue

Review effort: Balanced

Comment thread fragmentcollector_mpd.h
@pstroffolino
pstroffolino merged commit 3061af6 into dev_sprint_25_2 Oct 26, 2026
9 checks passed
@pstroffolino
pstroffolino deleted the feature/vpaamp-22 branch October 26, 2026 15:19
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.

5 participants