Skip to content

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

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.

Sign up for GitHub

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

Merged
pstroffolino merged 21 commits into from
Oct 26, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2e4543a
Initial attempt
Apr 2, 2026
ad57e30
Add L1
Apr 7, 2026
d4ab497
Remove unused
Apr 7, 2026
2a6b176
Fix empty schemeId in log messages after std::move
Copilot Apr 7, 2026
9168ddd
Apply suggestions from code review
pstroffolino Apr 13, 2026
fddfeb0
Merge branch 'dev_sprint_25_2' into feature/vpaamp-22
Aug 3, 2026
a803daa
Update fragmentcollector_mpd.h
cpc005 Aug 3, 2026
3305c57
Merge branch 'feature/vpaamp-22' of github.com:rdkcentral/aamp into f…
Aug 3, 2026
17e6ca9
review comments
Aug 3, 2026
04f3db4
Initial attempt
Apr 2, 2026
05a4ca3
Add L1
Apr 7, 2026
2235218
Remove unused
Apr 7, 2026
9ab41e7
Fix empty schemeId in log messages after std::move
Copilot Apr 7, 2026
62e6c93
Apply suggestions from code review
pstroffolino Apr 13, 2026
b09b391
Update fragmentcollector_mpd.h
cpc005 Aug 3, 2026
6122779
review comments
Aug 3, 2026
6570d60
Merge branch 'feature/vpaamp-22' of github.com:rdkcentral/aamp into f…
Sep 23, 2026
0493233
Merge branch 'dev_sprint_25_2' into feature/vpaamp-22
Sep 23, 2026
7519c78
Merge branch 'dev_sprint_25_2' into feature/vpaamp-22
Oct 21, 2026
cafbe40
Fix merge error
Oct 21, 2026
4f17e1f
Merge branch 'dev_sprint_25_2' into feature/vpaamp-22
pstroffolino Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions fragmentcollector_mpd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6590,6 +6590,21 @@ Accessibility StreamAbstractionAAMP_MPD::getAccessibilityNode(void* adaptationSe
return accessibilityNode;
}

/**
* @fn AddIfUnique
* @brief Adds a text track to the list if it is not already in list
* @return true if the text track was added, false otherwise
*/
bool StreamAbstractionAAMP_MPD::AddIfUnique(std::vector<TextTrackInfo> &tTracks, TextTrackInfo value)
{
if (std::find(tTracks.begin(), tTracks.end(), value) == tTracks.end())
{
tTracks.push_back(std::move(value));
return true;
}
return false;
}

/**
* @fn ParseTrackInformation
*
Expand Down Expand Up @@ -6748,34 +6763,43 @@ void StreamAbstractionAAMP_MPD::ParseTrackInformation(IAdaptationSet *adaptation
while (delim != std::string::npos)
{
ParseCCStreamIDAndLang(value.substr(0, delim), id, lang);
AAMPLOG_WARN("StreamAbstractionAAMP_MPD: CC Track - lang:%s, isCC:1, group:%s, id:%s",
lang.c_str(), schemeId.c_str(), id.c_str());

TextTrackInfo textTrack = TextTrackInfo(true, schemeId);
textTrack.setInstreamId(id);
textTrack.setLanguage(lang);
textTrack.setType("captions");
tTracks.push_back(std::move(textTrack));
if (AddIfUnique(tTracks, textTrack))
{
AAMPLOG_INFO("StreamAbstractionAAMP_MPD: CC Track - lang:%s, isCC:1, group:%s, id:%s",
lang.c_str(), schemeId.c_str(), id.c_str());
}
value = value.substr(delim + 1);
delim = value.find(';');
}
ParseCCStreamIDAndLang(std::move(value), id, lang);
lang = Getiso639map_NormalizeLanguageCode(lang,aamp->GetLangCodePreference());
AAMPLOG_WARN("StreamAbstractionAAMP_MPD: CC Track - lang:%s, isCC:1, group:%s, id:%s",
lang.c_str(), schemeId.c_str(), id.c_str());
TextTrackInfo textTrack = TextTrackInfo(true, std::move(schemeId));

TextTrackInfo textTrack = TextTrackInfo(true, schemeId);
textTrack.setInstreamId(id);
textTrack.setLanguage(lang);
textTrack.setType("captions");
tTracks.push_back(std::move(textTrack));
if (AddIfUnique(tTracks, textTrack))
{
AAMPLOG_INFO("StreamAbstractionAAMP_MPD: CC Track - lang:%s, isCC:1, group:%s, id:%s",
lang.c_str(), schemeId.c_str(), id.c_str());
}
}
else
{
// value = empty is highly discouraged as per spec, just added as fallback
AAMPLOG_WARN("StreamAbstractionAAMP_MPD: CC Track - group:%s, isCC:1", schemeId.c_str());
TextTrackInfo textTrack = TextTrackInfo(true, std::move(schemeId));

TextTrackInfo textTrack = TextTrackInfo(true, schemeId);
textTrack.setAccessibilityItem(accessibilityNode);
textTrack.setAvailable(true);
tTracks.push_back(std::move(textTrack));
if (AddIfUnique(tTracks, textTrack))
{
AAMPLOG_INFO("StreamAbstractionAAMP_MPD: CC Track - group:%s, isCC:1", schemeId.c_str());
}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions fragmentcollector_mpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,18 @@ class StreamAbstractionAAMP_MPD : public StreamAbstractionAAMP
void clearFirstPTS(void) override;

protected:
/**
* @fn AddIfUnique
* @brief Adds a text track to the list if it is not already present.
*
* @param[in,out] tTracks Collection of text tracks to update.
* @param[in] value Text track passed by value. The function may move from
* this local copy when inserting into @p tTracks.
*
* @return true if the text track was added, false otherwise.
*/
bool AddIfUnique(std::vector<TextTrackInfo> &tTracks, TextTrackInfo value);
Comment thread
Copilot marked this conversation as resolved.

/**
* @brief Send a manifest content error event and return its status.
*/
Expand Down
166 changes: 165 additions & 1 deletion test/utests/tests/StreamAbstractionAAMP_MPD/FunctionalTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3597,6 +3597,170 @@ R"(<?xml version="1.0" encoding="utf-8"?>
EXPECT_EQ(status, eAAMPSTATUS_OK);
}

/*
* Multiple adaptation sets all with the same CC language. Check that we only get one CC entry listed
* in the subtitle tracks, not 3 entries for the same language.
*/
TEST_F(FunctionalTests, CCMultipleAdaptation_Test1)
{

AAMPStatusType status;
static const char *manifest =
R"(<?xml version="1.0" encoding="UTF-8"?>
<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:scte35="urn:scte:scte35:2014:xml+bin" xmlns:scte214="scte214" xmlns:cenc="urn:mpeg:cenc:2013" xmlns:mspr="mspr" type="static" id="sonypictures.comDIAS0000000016158904-DIAS0000000016158905" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT0H0M2.919S" maxSegmentDuration="PT0H0M2.919548582S" mediaPresentationDuration="PT1H49M35.419S">
<Period id="1" start="PT0H0M0.000S">
<AdaptationSet id="10002" contentType="video" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1">
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="20002,30002" />
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC1=en"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-video-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-video-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180180" r="3282"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="video00" bandwidth="250400" codecs="avc1.4d401f" width="320" height="180" frameRate="24000/1001"/>
</AdaptationSet>
<AdaptationSet id="20002" contentType="video" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1">
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="10002,30002" />
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC1=en"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-video-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-video-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180180" r="3282"/>
<S t="594262194" d="262762" r="0"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="video05" bandwidth="2089600" codecs="avc1.640029" width="1280" height="720" frameRate="24000/1001"/>
</AdaptationSet>
<AdaptationSet id="30002" contentType="video" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1">
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="10002,20002" />
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC1=en"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-video-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-video-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180180" r="3282"/>
<S t="594262194" d="262762" r="0"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="video06" bandwidth="3632400" codecs="avc1.640029" width="1920" height="1080" frameRate="24000/1001"/>
</AdaptationSet>
<AdaptationSet id="3" contentType="audio" mimeType="audio/mp4" lang="en">
<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-audio-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-audio-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180480" r="11"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="audio_AAC_eng_02_false_00" bandwidth="139600" codecs="mp4a.40.5" audioSamplingRate="24000"/>
</AdaptationSet>
<AdaptationSet id="4" contentType="audio" mimeType="audio/mp4" lang="en">
<AudioChannelConfiguration schemeIdUri="tag:dolby.com,2014:dash:audio_channel_configuration:2011" value="f801"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest-eac3/track-audio-repid-$RepresentationID$-tc-0-header.mp4" media="manifest-eac3/track-audio-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="181440" r="1"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="audio_EAC3_eng_01_false_06" bandwidth="251200" codecs="ec-3" audioSamplingRate="48000"/>
</AdaptationSet>
</Period>
</MPD>
)";
// Initialize MPD. The video initialization segment is cached.
EXPECT_CALL(*g_mockMediaStreamContext, CacheFragment(_, _, _, _, _, true, _, _, _))
.WillRepeatedly(Return(true));
EXPECT_CALL(*g_mockPrivateInstanceAAMP, SetLLDashChunkMode(_));
status = InitializeMPD(manifest);
std::vector<TextTrackInfo> textTracks = mStreamAbstractionAAMP_MPD->GetAvailableTextTracks();
//To verify whether the CC attribute parsed from video
ASSERT_EQ(1,textTracks.size());
EXPECT_EQ(status, eAAMPSTATUS_OK);
}

/*
* Multiple adaption sets 2x CC languages. Check that we only get one CC entry listed for each language
*/
TEST_F(FunctionalTests, CCMultipleAdaption_Test2)
{
AAMPStatusType status;
static const char *manifest =
R"(<?xml version="1.0" encoding="UTF-8"?>
<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:scte35="urn:scte:scte35:2014:xml+bin" xmlns:scte214="scte214" xmlns:cenc="urn:mpeg:cenc:2013" xmlns:mspr="mspr" type="static" id="sonypictures.comDIAS0000000016158904-DIAS0000000016158905" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT0H0M2.919S" maxSegmentDuration="PT0H0M2.919548582S" mediaPresentationDuration="PT1H49M35.419S">
<Period id="1" start="PT0H0M0.000S">
<AdaptationSet id="10002" contentType="video" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1">
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="20002,30002" />
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC1=en"/>
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC2=fr"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-video-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-video-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180180" r="3282"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="video00" bandwidth="250400" codecs="avc1.4d401f" width="320" height="180" frameRate="24000/1001"/>
</AdaptationSet>
<AdaptationSet id="20002" contentType="video" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1">
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="10002,30002" />
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC1=en"/>
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC2=fr"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-video-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-video-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180180" r="3282"/>
<S t="594262194" d="262762" r="0"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="video05" bandwidth="2089600" codecs="avc1.640029" width="1280" height="720" frameRate="24000/1001"/>
</AdaptationSet>
<AdaptationSet id="30002" contentType="video" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1">
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="10002,20002" />
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC1=en"/>
<Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC2=fr"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-video-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-video-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180180" r="3282"/>
<S t="594262194" d="262762" r="0"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="video06" bandwidth="3632400" codecs="avc1.640029" width="1920" height="1080" frameRate="24000/1001"/>
</AdaptationSet>
<AdaptationSet id="3" contentType="audio" mimeType="audio/mp4" lang="en">
<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest/track-audio-repid-$RepresentationID$-tc-0-header.mp4" media="manifest/track-audio-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="180480" r="11"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="audio_AAC_eng_02_false_00" bandwidth="139600" codecs="mp4a.40.5" audioSamplingRate="24000"/>
</AdaptationSet>
<AdaptationSet id="4" contentType="audio" mimeType="audio/mp4" lang="en">
<AudioChannelConfiguration schemeIdUri="tag:dolby.com,2014:dash:audio_channel_configuration:2011" value="f801"/>
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
<SegmentTemplate initialization="manifest-eac3/track-audio-repid-$RepresentationID$-tc-0-header.mp4" media="manifest-eac3/track-audio-repid-$RepresentationID$-tc-0-frag-$Number$.mp4" timescale="90000" startNumber="1" presentationTimeOffset="2731254">
<SegmentTimeline>
<S t="2731254" d="181440" r="1"/>
</SegmentTimeline>
</SegmentTemplate>
<Representation id="audio_EAC3_eng_01_false_06" bandwidth="251200" codecs="ec-3" audioSamplingRate="48000"/>
</AdaptationSet>
</Period>
</MPD>
)";
// Initialize MPD. The video initialization segment is cached.
EXPECT_CALL(*g_mockMediaStreamContext, CacheFragment(_, _, _, _, _, true, _, _, _))
.WillRepeatedly(Return(true));
EXPECT_CALL(*g_mockPrivateInstanceAAMP, SetLLDashChunkMode(_));
status = InitializeMPD(manifest);
std::vector<TextTrackInfo> textTracks = mStreamAbstractionAAMP_MPD->GetAvailableTextTracks();
//To verify whether the CC attribute parsed from video
ASSERT_EQ(2,textTracks.size());
ASSERT_EQ("en",textTracks[0].language);
ASSERT_EQ("fr",textTracks[1].language);
EXPECT_EQ(status, eAAMPSTATUS_OK);
}
/*
* @brief Test to make sure ChunkMode is turned off for non-LLD streams.
* This test checks that ChunkMode (used for lld) is not
Expand Down Expand Up @@ -4505,7 +4669,7 @@ TEST_F(StreamAbstractionAAMP_MPDTest, Stop_NotifiesVideoTsbWaiters)
mStreamAbstractionAAMP_MPD->InitTsbReader(eTUNETYPE_SEEKTOLIVE);

EXPECT_CALL(*g_mockPrivateInstanceAAMP, IsLocalAAMPTsbInjection()).WillOnce(Return(true));
// Start the TSB reader thread
// Start the TSB reader thread
mStreamAbstractionAAMP_MPD->Start();
EXPECT_CALL(*g_mockTSBSessionManager, NotifyVideoTsbWaiters()).Times(1);

Expand Down
Loading