Improve speaker labeling. Support custom CFs.

ebu · Nov 11, 2023 · fb7a6b7 · fb7a6b7
1 parent d8a0655
commit fb7a6b7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/ear-production-suite-plugins/plugins/direct_speakers/src/channel_meter_layout.hpp b/ear-production-suite-plugins/plugins/direct_speakers/src/channel_meter_layout.hpp
@@ -99,12 +99,7 @@ class ChannelMeterLayout : public Component {
     if (pfData) {
       for (int i = 0; i < pfData->relatedChannelFormats.size(); ++i) {
         auto cfData = pfData->relatedChannelFormats[i];
-        std::string label;
-        if (cfData->legacySpeakerLabel.has_value()) {
-          label = cfData->legacySpeakerLabel.value();
-        } else if (cfData->ituLabel.has_value()) {
-          label = cfData->ituLabel.value();
-        }
+        auto label = cfData->getBestSpeakerLabel();
         speakerLevels_.push_back(std::make_unique<SpeakerLevel>(label));
         speakerLevels_.back()->getLevelMeter()->setMeter(levelMeter_, i);
         if (i < 6) {

diff --git a/shared/components/speaker_layer.cpp b/shared/components/speaker_layer.cpp
@@ -64,13 +64,7 @@ void SpeakerLayer::paint(Graphics& g) {
                 layer = Layer::upper;
             }
             if (layer == layer_) {
-                std::string label;
-                if (cfData->legacySpeakerLabel.has_value()) {
-                    label = cfData->legacySpeakerLabel.value();
-                }
-                else if (cfData->ituLabel.has_value()) {
-                    label = cfData->ituLabel.value();
-                }
+                auto label = cfData->getBestSpeakerLabel();
                 if (cfData->elevation >= 90.f) {
                     drawVoiceOfGod(g, label);
                 }

diff --git a/shared/helper/adm_preset_definitions_helper.cpp b/shared/helper/adm_preset_definitions_helper.cpp
@@ -211,6 +211,17 @@ bool AdmPresetDefinitionsHelper::ChannelFormatData::isCommonDefinition()
 	return idValue <= 0x0FFF;
 }
 
+std::string AdmPresetDefinitionsHelper::ChannelFormatData::getBestSpeakerLabel()
+{
+	if (legacySpeakerLabel.has_value())
+		return legacySpeakerLabel.value();
+	if (ituLabel.has_value())
+		return ituLabel.value();
+	if (speakerLabels.size() > 0)
+		return speakerLabels[0];
+	return name;
+}
+
 void AdmPresetDefinitionsHelper::ChannelFormatData::setItuLabels()
 {
 	for (auto const& speakerLabel : speakerLabels) {

diff --git a/shared/helper/adm_preset_definitions_helper.h b/shared/helper/adm_preset_definitions_helper.h
@@ -36,6 +36,7 @@ class AdmPresetDefinitionsHelper {
 		float distance{ 1.f	};
 
 		bool isCommonDefinition();
+		std::string getBestSpeakerLabel();
 
 	private:
 		void setItuLabels();

diff --git a/shared/helper/supplementary_definitions.hpp b/shared/helper/supplementary_definitions.hpp
@@ -146,15 +146,17 @@ R"5UPPL3M3N74RY(
         <!-- audioPackFormat_18 in MPEG-H ADM Profile 1.0.0 -->
         <audioChannelFormat audioChannelFormatID="AC_00011001" audioChannelFormatName="Left back surround" typeLabel="0001" typeDefinition="DirectSpeakers">
           <audioBlockFormat audioBlockFormatID="AB_00011001_00000001">
-            <speakerLabel>CH_M_L150</speakerLabel>
+            <!-- speakerLabel "CH_M_L150" -->
+            <speakerLabel>L150</speakerLabel>
             <position coordinate="azimuth">150.0</position>
             <position coordinate="elevation">0.0</position>
             <position coordinate="distance">1.0</position>
           </audioBlockFormat>
         </audioChannelFormat>
         <audioChannelFormat audioChannelFormatID="AC_00011002" audioChannelFormatName="Right back surround" typeLabel="0001" typeDefinition="DirectSpeakers">
           <audioBlockFormat audioBlockFormatID="AB_00011002_00000001">
-            <speakerLabel>CH_M_R150</speakerLabel>
+            <!-- speakerLabel "CH_M_R150" -->
+            <speakerLabel>R150</speakerLabel>
             <position coordinate="azimuth">-150.0</position>
             <position coordinate="elevation">0.0</position>
             <position coordinate="distance">1.0</position>