Revert component_mixing_type set to false

y-guyon · y-guyon · commit e48b7cf7603b · 2026-03-05T13:53:25.000+01:00
Setting component_mixing_type[MAX_NB_ALTERNATE] to false does not compile. Partial revert of 9f176cb.
diff --git a/IsoLib/t35_tool/sources/SMPTE_ST2094_50.cpp b/IsoLib/t35_tool/sources/SMPTE_ST2094_50.cpp
@@ -651,7 +651,7 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){
               if (sumCoefficients != Q_COMPONENT_MIXING_COEFFICIENT) { logMsg(LOGLEVEL_WARNING, "Sum component mixing coefficient for alternate %d is not equal to 1.0, they will be scaled to 1.0 at decoding", iAlt); }
           }
           if (elm.component_mixing_type[0] != elm.component_mixing_type[iAlt]) {
-            elm.component_mixing_type = false;
+            elm.has_common_curve_params_flag = false;
           }
 
           // Create syntax elements for the gain curve function

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ void SMPTE_ST2094_50::convertMetadataItemsToSyntaxElements(){`
`651`	`651`	`if (sumCoefficients != Q_COMPONENT_MIXING_COEFFICIENT) { logMsg(LOGLEVEL_WARNING, "Sum component mixing coefficient for alternate %d is not equal to 1.0, they will be scaled to 1.0 at decoding", iAlt); }`
`652`	`652`	`}`
`653`	`653`	`if (elm.component_mixing_type[0] != elm.component_mixing_type[iAlt]) {`
`654`		`- elm.component_mixing_type = false;`
	`654`	`+ elm.has_common_curve_params_flag = false;`
`655`	`655`	`}`
`656`	`656`
`657`	`657`	`// Create syntax elements for the gain curve function`