Merge pull request #978 from simoninns/issue970-2025

simoninns · web-flow · commit ee539399761b · 2025-12-07T08:56:16.000+01:00
Fix for issue #970
diff --git a/tools/ld-json-converter/lddecodemetadata.cpp b/tools/ld-json-converter/lddecodemetadata.cpp
@@ -947,7 +947,10 @@ void LdDecodeMetaData::clearFieldDropOuts(qint32 sequentialFieldNumber)
 // This method appends a new field to the existing metadata
 void LdDecodeMetaData::appendField(const LdDecodeMetaData::Field &field)
 {
-    fields.append(field);
+    // Ensure appended fields receive contiguous sequential numbering
+    LdDecodeMetaData::Field fieldCopy = field;
+    fieldCopy.seqNo = fields.size() + 1;
+    fields.append(fieldCopy);
 
     videoParameters.numberOfSequentialFields = fields.size();
 }
diff --git a/tools/library/tbc/lddecodemetadata.cpp b/tools/library/tbc/lddecodemetadata.cpp
@@ -900,7 +900,10 @@ void LdDecodeMetaData::clearFieldDropOuts(qint32 sequentialFieldNumber)
 // This method appends a new field to the existing metadata
 void LdDecodeMetaData::appendField(const LdDecodeMetaData::Field &field)
 {
-    fields.append(field);
+    // Ensure sequential numbering stays contiguous when writing out
+    LdDecodeMetaData::Field fieldCopy = field;
+    fieldCopy.seqNo = fields.size() + 1;
+    fields.append(fieldCopy);
 
     videoParameters.numberOfSequentialFields = fields.size();
 }

Original file line number	Diff line number	Diff line change
`@@ -947,7 +947,10 @@ void LdDecodeMetaData::clearFieldDropOuts(qint32 sequentialFieldNumber)`
`947`	`947`	`// This method appends a new field to the existing metadata`
`948`	`948`	`void LdDecodeMetaData::appendField(const LdDecodeMetaData::Field &field)`
`949`	`949`	`{`
`950`		`- fields.append(field);`
	`950`	`+ // Ensure appended fields receive contiguous sequential numbering`
	`951`	`+ LdDecodeMetaData::Field fieldCopy = field;`
	`952`	`+ fieldCopy.seqNo = fields.size() + 1;`
	`953`	`+ fields.append(fieldCopy);`
`951`	`954`
`952`	`955`	`videoParameters.numberOfSequentialFields = fields.size();`
`953`	`956`	`}`
Original file line number	Diff line number	Diff line change
`@@ -900,7 +900,10 @@ void LdDecodeMetaData::clearFieldDropOuts(qint32 sequentialFieldNumber)`
`900`	`900`	`// This method appends a new field to the existing metadata`
`901`	`901`	`void LdDecodeMetaData::appendField(const LdDecodeMetaData::Field &field)`
`902`	`902`	`{`
`903`		`- fields.append(field);`
	`903`	`+ // Ensure sequential numbering stays contiguous when writing out`
	`904`	`+ LdDecodeMetaData::Field fieldCopy = field;`
	`905`	`+ fieldCopy.seqNo = fields.size() + 1;`
	`906`	`+ fields.append(fieldCopy);`
`904`	`907`
`905`	`908`	`videoParameters.numberOfSequentialFields = fields.size();`
`906`	`909`	`}`