diff --git a/dlb_adm/src/adm_transformer/XMLConstants.h b/dlb_adm/src/adm_transformer/XMLConstants.h index 3db431b0..47186f1d 100644 --- a/dlb_adm/src/adm_transformer/XMLConstants.h +++ b/dlb_adm/src/adm_transformer/XMLConstants.h @@ -63,8 +63,8 @@ typedef struct const std::vector 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 diff --git a/dlb_adm/src/adm_transformer/XMLIngester.cpp b/dlb_adm/src/adm_transformer/XMLIngester.cpp index 35e0b91b..d2fdcef2 100644 --- a/dlb_adm/src/adm_transformer/XMLIngester.cpp +++ b/dlb_adm/src/adm_transformer/XMLIngester.cpp @@ -1298,7 +1298,7 @@ static int RecognizeProfile { /* - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 */ diff --git a/dlb_adm/test/unit/AnalyzeContentXMLBuffers.h b/dlb_adm/test/unit/AnalyzeContentXMLBuffers.h index 4831c320..6fe62a5e 100644 --- a/dlb_adm/test/unit/AnalyzeContentXMLBuffers.h +++ b/dlb_adm/test/unit/AnalyzeContentXMLBuffers.h @@ -52,7 +52,7 @@ static std::string object_ref = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -94,7 +94,7 @@ static std::string object_ref = R"( AC_00010001 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 )"; @@ -114,7 +114,7 @@ static std::string xml_20 = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -147,7 +147,7 @@ static std::string xml_20 = R"( AC_00010002 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 )"; @@ -167,7 +167,7 @@ static std::string object_ref_pack_format_wrong = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -203,7 +203,7 @@ static std::string object_ref_pack_format_wrong = R"( AC_00010002 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 )"; @@ -223,7 +223,7 @@ static std::string object_ref_wrong = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -262,7 +262,7 @@ static std::string object_ref_wrong = R"( AC_00010002 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 )"; @@ -283,7 +283,7 @@ static std::string content_wrong = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -330,7 +330,7 @@ static std::string content_wrong = R"( AC_00010002 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 )"; @@ -351,7 +351,7 @@ static std::string packformat_wrong = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -388,7 +388,7 @@ static std::string packformat_wrong = R"( AC_00010002 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 )"; @@ -432,7 +432,7 @@ static std::string altValSet = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -631,7 +631,7 @@ static std::string altValSet = R"( AC_00031007 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 diff --git a/dlb_adm/test/unit/dlb_adm_data.h b/dlb_adm/test/unit/dlb_adm_data.h index aa60596f..54c535bc 100644 --- a/dlb_adm/test/unit/dlb_adm_data.h +++ b/dlb_adm/test/unit/dlb_adm_data.h @@ -58,7 +58,7 @@ static const char stereoXML[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -195,7 +195,7 @@ static const char stereoXML[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031003\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" diff --git a/dlb_adm/test/unit/dlb_adm_emission_profile_data.h b/dlb_adm/test/unit/dlb_adm_emission_profile_data.h index 5beabc08..da7a2d5f 100644 --- a/dlb_adm/test/unit/dlb_adm_emission_profile_data.h +++ b/dlb_adm/test/unit/dlb_adm_emission_profile_data.h @@ -436,7 +436,7 @@ static const char generatedEmissionProfileXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -646,7 +646,7 @@ static const char generatedEmissionProfileXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031004\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -691,7 +691,7 @@ static const char emissionProfileCompliantXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -908,7 +908,7 @@ static const char emissionProfileCompliantXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031004\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -953,7 +953,7 @@ static const char complementaryObjectsXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -1143,7 +1143,7 @@ static const char complementaryObjectsXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031004\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1187,7 +1187,7 @@ static const char multipleProgrammesXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -1400,7 +1400,7 @@ static const char multipleProgrammesXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031004\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1441,7 +1441,7 @@ static const char adAndSpokenSubtitlesXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -1621,7 +1621,7 @@ static const char adAndSpokenSubtitlesXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031001\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1671,13 +1671,13 @@ static const char complementaryMultichannelObjectsXMLBuffer[] GTEST_ATTRIBUTE_UN " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n" @@ -1820,7 +1820,7 @@ static const char complementaryMultichannelObjectsXMLBuffer[] GTEST_ATTRIBUTE_UN " AC_00031003\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1870,13 +1870,13 @@ static const char multipleProgrammesUsingMonoObjectsXMLBuffer[] GTEST_ATTRIBUTE_ " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n" @@ -2081,7 +2081,7 @@ static const char multipleProgrammesUsingMonoObjectsXMLBuffer[] GTEST_ATTRIBUTE_ " AC_00031003\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -2131,13 +2131,13 @@ static const char audioObjectInteractionBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n" @@ -2350,7 +2350,7 @@ static const char audioObjectInteractionBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031004\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -2390,13 +2390,13 @@ static const char broadcastMixXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n" @@ -2466,7 +2466,7 @@ static const char broadcastMixXMLBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00010002\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -2512,7 +2512,7 @@ static const char multipleComplementaryBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-Emission]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " AC_00031001\n" @@ -2760,7 +2760,7 @@ static const char complementaryAndAvsBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -2928,7 +2928,7 @@ static const char complementaryAndAvsBuffer[] GTEST_ATTRIBUTE_UNUSED_ = " AC_00031002\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -2973,7 +2973,7 @@ static std::string singleComplementaryMemberInProgramme= R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -3160,7 +3160,7 @@ static std::string singleComplementaryMemberInProgramme= R"(AC_00031004 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -3211,7 +3211,7 @@ static std::string sadmUnconsistentLanguages= R"(ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -3349,7 +3349,7 @@ static std::string sadmUnconsistentLanguages= R"(ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -3389,7 +3389,7 @@ const std::string sadm_51_MnE_3D_complementary = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -3541,7 +3541,7 @@ const std::string sadm_51_MnE_3D_complementary = R"(AC_00031003 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -3564,7 +3564,7 @@ static std::string xml_me_2D_AVS = R"( - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 @@ -3638,7 +3638,7 @@ static std::string xml_me_2D_AVS = R"( AC_00031002 - ITU-R BS.[ADM-NGA-EMISSION]-X + ITU-R BS.2168 diff --git a/dlb_pmd/unit_test/test_data.h b/dlb_pmd/unit_test/test_data.h index 33c3e94d..874259d0 100644 --- a/dlb_pmd/unit_test/test_data.h +++ b/dlb_pmd/unit_test/test_data.h @@ -499,7 +499,7 @@ static const char *extraObjectADMEmission GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -590,7 +590,7 @@ static const char *extraObjectADMEmission GTEST_ATTRIBUTE_UNUSED_ = " AC_00031003\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1095,7 +1095,7 @@ static const char *altSpkrADM GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -1350,7 +1350,7 @@ static const char *altSpkrADM GTEST_ATTRIBUTE_UNUSED_ = " AC_0001100E\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1426,7 +1426,7 @@ static const char *bedClassCM_SADM GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -1460,7 +1460,7 @@ static const char *bedClassCM_SADM GTEST_ATTRIBUTE_UNUSED_ = " AC_00010002\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1643,7 +1643,7 @@ static const char *bedClassME_D_SADM GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -1746,7 +1746,7 @@ static const char *bedClassME_D_SADM GTEST_ATTRIBUTE_UNUSED_ = " AC_00031002\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -1889,7 +1889,7 @@ static const char *bedClassDEF_CM_BM_SADM GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -1981,7 +1981,7 @@ static const char *bedClassDEF_CM_BM_SADM GTEST_ATTRIBUTE_UNUSED_ = " AC_00010002\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -2216,7 +2216,7 @@ static const char *content_label_diff_lang_SADM GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -2391,7 +2391,7 @@ static const char *content_label_diff_lang_SADM GTEST_ATTRIBUTE_UNUSED_ = " AC_00031004\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -2626,7 +2626,7 @@ static const char *content_label_same_lang_SADM GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -2801,7 +2801,7 @@ static const char *content_label_same_lang_SADM GTEST_ATTRIBUTE_UNUSED_ = " AC_00031004\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n" @@ -2886,7 +2886,7 @@ static const char *only_objects_SADM GTEST_ATTRIBUTE_UNUSED_ = " \n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" " \n" @@ -2938,7 +2938,7 @@ static const char *only_objects_SADM GTEST_ATTRIBUTE_UNUSED_ = " AC_00031001\n" " \n" " \n" -" ITU-R BS.[ADM-NGA-EMISSION]-X\n" +" ITU-R BS.2168\n" " \n" " \n" "\n"