Skip to content

Changes following the release of emission profile by ITU #14

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

Open
jtc-dolby wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes following the release of emission profile by ITU #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dlb_adm/src/adm_transformer/XMLConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ typedef struct

const std::vector<ProfileDescriptor> SUPPORTED_PROFILES =
{
// TODO: ensure those values are correct
ProfileDescriptor{"AdvSS Emission S-ADM Profile", "1.0.0", 1, "ITU-R BS.[ADM-NGA-EMISSION]-X", DLB_ADM_PROFILE_SADM_EMISSION_PROFILE}
// As per section 2.1.10.1 of ITU-R BS2168-0
ProfileDescriptor{"Advanced sound system: ADM and S-ADM profile for emission", "1", 1, "ITU-R BS.2168", DLB_ADM_PROFILE_SADM_EMISSION_PROFILE}
};

#endif // DLB_ADM_XML_CONSTANTS_H
2 changes: 1 addition & 1 deletion dlb_adm/src/adm_transformer/XMLIngester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ static int RecognizeProfile
{
/*
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
*/

Expand Down
28 changes: 14 additions & 14 deletions dlb_adm/test/unit/AnalyzeContentXMLBuffers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static std::string object_ref = R"(
</audioTrack>
</transportTrackFormat>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</frameHeader>
<audioFormatExtended version="ITU-R_BS.2076-3">
Expand Down Expand Up @@ -94,7 +94,7 @@ static std::string object_ref = R"(
<audioChannelFormatIDRef>AC_00010001</audioChannelFormatIDRef>
</audioTrackUID>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</audioFormatExtended>
</frame>)";
Expand All @@ -114,7 +114,7 @@ static std::string xml_20 = R"(
</audioTrack>
</transportTrackFormat>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</frameHeader>
<audioFormatExtended version="ITU-R_BS.2076-3">
Expand Down Expand Up @@ -147,7 +147,7 @@ static std::string xml_20 = R"(
<audioChannelFormatIDRef>AC_00010002</audioChannelFormatIDRef>
</audioTrackUID>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</audioFormatExtended>
</frame>)";
Expand All @@ -167,7 +167,7 @@ static std::string object_ref_pack_format_wrong = R"(
</audioTrack>
</transportTrackFormat>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</frameHeader>
<audioFormatExtended version="ITU-R_BS.2076-3">
Expand Down Expand Up @@ -203,7 +203,7 @@ static std::string object_ref_pack_format_wrong = R"(
<audioChannelFormatIDRef>AC_00010002</audioChannelFormatIDRef>
</audioTrackUID>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</audioFormatExtended>
</frame>)";
Expand All @@ -223,7 +223,7 @@ static std::string object_ref_wrong = R"(
</audioTrack>
</transportTrackFormat>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</frameHeader>
<audioFormatExtended version="ITU-R_BS.2076-3">
Expand Down Expand Up @@ -262,7 +262,7 @@ static std::string object_ref_wrong = R"(
<audioChannelFormatIDRef>AC_00010002</audioChannelFormatIDRef>
</audioTrackUID>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</audioFormatExtended>
</frame>)";
Expand All @@ -283,7 +283,7 @@ static std::string content_wrong = R"(
</audioTrack>
</transportTrackFormat>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</frameHeader>
<audioFormatExtended version="ITU-R_BS.2076-3">
Expand Down Expand Up @@ -330,7 +330,7 @@ static std::string content_wrong = R"(
<audioChannelFormatIDRef>AC_00010002</audioChannelFormatIDRef>
</audioTrackUID>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</audioFormatExtended>
</frame>)";
Expand All @@ -351,7 +351,7 @@ static std::string packformat_wrong = R"(
</audioTrack>
</transportTrackFormat>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</frameHeader>
<audioFormatExtended version="ITU-R_BS.2076-3">
Expand Down Expand Up @@ -388,7 +388,7 @@ static std::string packformat_wrong = R"(
<audioChannelFormatIDRef>AC_00010002</audioChannelFormatIDRef>
</audioTrackUID>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</audioFormatExtended>
</frame>)";
Expand Down Expand Up @@ -432,7 +432,7 @@ static std::string altValSet = R"(
</audioTrack>
</transportTrackFormat>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</frameHeader>
<audioFormatExtended version="ITU-R_BS.2076-3">
Expand Down Expand Up @@ -631,7 +631,7 @@ static std::string altValSet = R"(
<audioChannelFormatIDRef>AC_00031007</audioChannelFormatIDRef>
</audioTrackUID>
<profileList>
<profile profileName="AdvSS Emission S-ADM Profile" profileVersion="1.0.0" profileLevel="1">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>
<profile profileName="Advanced sound system: ADM and S-ADM profile for emission" profileVersion="1" profileLevel="1">ITU-R BS.2168</profile>
</profileList>
</audioFormatExtended>
</frame>
Expand Down
4 changes: 2 additions & 2 deletions dlb_adm/test/unit/dlb_adm_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static const char stereoXML[] GTEST_ATTRIBUTE_UNUSED_ =
" </audioTrack>\n"
" </transportTrackFormat>\n"
" <profileList>\n"
" <profile profileName=\"AdvSS Emission S-ADM Profile\" profileVersion=\"1.0.0\" profileLevel=\"1\">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>\n"
" <profile profileName=\"Advanced sound system: ADM and S-ADM profile for emission\" profileVersion=\"1\" profileLevel=\"1\">ITU-R BS.2168</profile>\n"
" </profileList>\n"
" </frameHeader>\n"
" <audioFormatExtended version=\"ITU-R_BS.2076-3\">\n"
Expand Down Expand Up @@ -195,7 +195,7 @@ static const char stereoXML[] GTEST_ATTRIBUTE_UNUSED_ =
" <audioChannelFormatIDRef>AC_00031003</audioChannelFormatIDRef>\n"
" </audioTrackUID>\n"
" <profileList>\n"
" <profile profileName=\"AdvSS Emission S-ADM Profile\" profileVersion=\"1.0.0\" profileLevel=\"1\">ITU-R BS.[ADM-NGA-EMISSION]-X</profile>\n"
" <profile profileName=\"Advanced sound system: ADM and S-ADM profile for emission\" profileVersion=\"1\" profileLevel=\"1\">ITU-R BS.2168</profile>\n"
" </profileList>\n"
" </audioFormatExtended>\n"
"</frame>\n"
Expand Down
Loading