Skip to content

Commit 4fbe60f

Browse files
homulerhomuler
authored
build: MediaPipe v0.10.22 (#1357)
1 parent d816caa commit 4fbe60f

File tree

8 files changed

+241
-33
lines changed

8 files changed

+241
-33
lines changed

‎Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/Calculators/Util/LandmarksSmoothingCalculator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,8 +1089,8 @@ public void ClearBeta() {
10891089

10901090
private float derivateCutoff_;
10911091
/// <summary>
1092-
/// Cutoff frequency for derivate. It is set to 1Hz in the original
1093-
/// algorithm, but can be tuned to further smooth the speed (i.e. derivate)
1092+
/// Cutoff frequency for derivative. It is set to 1Hz in the original
1093+
/// algorithm, but can be tuned to further smooth the speed (i.e. derivative)
10941094
/// on the object.
10951095
/// </summary>
10961096
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]

‎Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/Calculators/Util/NonMaxSuppressionCalculator.cs‎

Lines changed: 61 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static NonMaxSuppressionCalculatorReflection() {
2626
string.Concat(
2727
"Cj9tZWRpYXBpcGUvY2FsY3VsYXRvcnMvdXRpbC9ub25fbWF4X3N1cHByZXNz",
2828
"aW9uX2NhbGN1bGF0b3IucHJvdG8SCW1lZGlhcGlwZRokbWVkaWFwaXBlL2Zy",
29-
"YW1ld29yay9jYWxjdWxhdG9yLnByb3RvIvUECiJOb25NYXhTdXBwcmVzc2lv",
29+
"YW1ld29yay9jYWxjdWxhdG9yLnByb3RvIpQFCiJOb25NYXhTdXBwcmVzc2lv",
3030
"bkNhbGN1bGF0b3JPcHRpb25zEiAKFW51bV9kZXRlY3Rpb25fc3RyZWFtcxgB",
3131
"IAEoBToBMRIeChJtYXhfbnVtX2RldGVjdGlvbnMYAiABKAU6Ai0xEh8KE21p",
3232
"bl9zY29yZV90aHJlc2hvbGQYBiABKAI6Ai0xEiQKGW1pbl9zdXBwcmVzc2lv",
@@ -35,16 +35,17 @@ static NonMaxSuppressionCalculatorReflection() {
3535
"T3ZlcmxhcFR5cGU6B0pBQ0NBUkQSHwoXcmV0dXJuX2VtcHR5X2RldGVjdGlv",
3636
"bnMYBSABKAgSVgoJYWxnb3JpdGhtGAcgASgOMjoubWVkaWFwaXBlLk5vbk1h",
3737
"eFN1cHByZXNzaW9uQ2FsY3VsYXRvck9wdGlvbnMuTm1zQWxnb3JpdGhtOgdE",
38-
"RUZBVUxUImsKC092ZXJsYXBUeXBlEhwKGFVOU1BFQ0lGSUVEX09WRVJMQVBf",
39-
"VFlQRRAAEgsKB0pBQ0NBUkQQARIUChBNT0RJRklFRF9KQUNDQVJEEAISGwoX",
40-
"SU5URVJTRUNUSU9OX09WRVJfVU5JT04QAyIpCgxObXNBbGdvcml0aG0SCwoH",
41-
"REVGQVVMVBAAEgwKCFdFSUdIVEVEEAEyWwoDZXh0EhwubWVkaWFwaXBlLkNh",
42-
"bGN1bGF0b3JPcHRpb25zGLyotBogASgLMi0ubWVkaWFwaXBlLk5vbk1heFN1",
43-
"cHByZXNzaW9uQ2FsY3VsYXRvck9wdGlvbnM="));
38+
"RUZBVUxUEh0KDm11bHRpY2xhc3Nfbm1zGAggASgIOgVmYWxzZSJrCgtPdmVy",
39+
"bGFwVHlwZRIcChhVTlNQRUNJRklFRF9PVkVSTEFQX1RZUEUQABILCgdKQUND",
40+
"QVJEEAESFAoQTU9ESUZJRURfSkFDQ0FSRBACEhsKF0lOVEVSU0VDVElPTl9P",
41+
"VkVSX1VOSU9OEAMiKQoMTm1zQWxnb3JpdGhtEgsKB0RFRkFVTFQQABIMCghX",
42+
"RUlHSFRFRBABMlsKA2V4dBIcLm1lZGlhcGlwZS5DYWxjdWxhdG9yT3B0aW9u",
43+
"cxi8qLQaIAEoCzItLm1lZGlhcGlwZS5Ob25NYXhTdXBwcmVzc2lvbkNhbGN1",
44+
"bGF0b3JPcHRpb25z"));
4445
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
4546
new pbr::FileDescriptor[] { global::Mediapipe.CalculatorReflection.Descriptor, },
4647
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
47-
new pbr::GeneratedClrTypeInfo(typeof(global::Mediapipe.NonMaxSuppressionCalculatorOptions), global::Mediapipe.NonMaxSuppressionCalculatorOptions.Parser, new[]{ "NumDetectionStreams", "MaxNumDetections", "MinScoreThreshold", "MinSuppressionThreshold", "OverlapType", "ReturnEmptyDetections", "Algorithm" }, null, new[]{ typeof(global::Mediapipe.NonMaxSuppressionCalculatorOptions.Types.OverlapType), typeof(global::Mediapipe.NonMaxSuppressionCalculatorOptions.Types.NmsAlgorithm) }, new pb::Extension[] { global::Mediapipe.NonMaxSuppressionCalculatorOptions.Extensions.Ext }, null)
48+
new pbr::GeneratedClrTypeInfo(typeof(global::Mediapipe.NonMaxSuppressionCalculatorOptions), global::Mediapipe.NonMaxSuppressionCalculatorOptions.Parser, new[]{ "NumDetectionStreams", "MaxNumDetections", "MinScoreThreshold", "MinSuppressionThreshold", "OverlapType", "ReturnEmptyDetections", "Algorithm", "MulticlassNms" }, null, new[]{ typeof(global::Mediapipe.NonMaxSuppressionCalculatorOptions.Types.OverlapType), typeof(global::Mediapipe.NonMaxSuppressionCalculatorOptions.Types.NmsAlgorithm) }, new pb::Extension[] { global::Mediapipe.NonMaxSuppressionCalculatorOptions.Extensions.Ext }, null)
4849
}));
4950
}
5051
#endregion
@@ -98,6 +99,7 @@ public NonMaxSuppressionCalculatorOptions(NonMaxSuppressionCalculatorOptions oth
9899
overlapType_ = other.overlapType_;
99100
returnEmptyDetections_ = other.returnEmptyDetections_;
100101
algorithm_ = other.algorithm_;
102+
multiclassNms_ = other.multiclassNms_;
101103
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
102104
}
103105

@@ -315,6 +317,33 @@ public void ClearAlgorithm() {
315317
_hasBits0 &= ~64;
316318
}
317319

320+
/// <summary>Field number for the "multiclass_nms" field.</summary>
321+
public const int MulticlassNmsFieldNumber = 8;
322+
private readonly static bool MulticlassNmsDefaultValue = false;
323+
324+
private bool multiclassNms_;
325+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
326+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
327+
public bool MulticlassNms {
328+
get { if ((_hasBits0 & 128) != 0) { return multiclassNms_; } else { return MulticlassNmsDefaultValue; } }
329+
set {
330+
_hasBits0 |= 128;
331+
multiclassNms_ = value;
332+
}
333+
}
334+
/// <summary>Gets whether the "multiclass_nms" field is set</summary>
335+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
336+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
337+
public bool HasMulticlassNms {
338+
get { return (_hasBits0 & 128) != 0; }
339+
}
340+
/// <summary>Clears the value of the "multiclass_nms" field</summary>
341+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
342+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
343+
public void ClearMulticlassNms() {
344+
_hasBits0 &= ~128;
345+
}
346+
318347
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
319348
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
320349
public override bool Equals(object other) {
@@ -337,6 +366,7 @@ public bool Equals(NonMaxSuppressionCalculatorOptions other) {
337366
if (OverlapType != other.OverlapType) return false;
338367
if (ReturnEmptyDetections != other.ReturnEmptyDetections) return false;
339368
if (Algorithm != other.Algorithm) return false;
369+
if (MulticlassNms != other.MulticlassNms) return false;
340370
return Equals(_unknownFields, other._unknownFields);
341371
}
342372

@@ -351,6 +381,7 @@ public override int GetHashCode() {
351381
if (HasOverlapType) hash ^= OverlapType.GetHashCode();
352382
if (HasReturnEmptyDetections) hash ^= ReturnEmptyDetections.GetHashCode();
353383
if (HasAlgorithm) hash ^= Algorithm.GetHashCode();
384+
if (HasMulticlassNms) hash ^= MulticlassNms.GetHashCode();
354385
if (_unknownFields != null) {
355386
hash ^= _unknownFields.GetHashCode();
356387
}
@@ -397,6 +428,10 @@ public void WriteTo(pb::CodedOutputStream output) {
397428
output.WriteRawTag(56);
398429
output.WriteEnum((int) Algorithm);
399430
}
431+
if (HasMulticlassNms) {
432+
output.WriteRawTag(64);
433+
output.WriteBool(MulticlassNms);
434+
}
400435
if (_unknownFields != null) {
401436
_unknownFields.WriteTo(output);
402437
}
@@ -435,6 +470,10 @@ public void WriteTo(pb::CodedOutputStream output) {
435470
output.WriteRawTag(56);
436471
output.WriteEnum((int) Algorithm);
437472
}
473+
if (HasMulticlassNms) {
474+
output.WriteRawTag(64);
475+
output.WriteBool(MulticlassNms);
476+
}
438477
if (_unknownFields != null) {
439478
_unknownFields.WriteTo(ref output);
440479
}
@@ -466,6 +505,9 @@ public int CalculateSize() {
466505
if (HasAlgorithm) {
467506
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Algorithm);
468507
}
508+
if (HasMulticlassNms) {
509+
size += 1 + 1;
510+
}
469511
if (_unknownFields != null) {
470512
size += _unknownFields.CalculateSize();
471513
}
@@ -499,6 +541,9 @@ public void MergeFrom(NonMaxSuppressionCalculatorOptions other) {
499541
if (other.HasAlgorithm) {
500542
Algorithm = other.Algorithm;
501543
}
544+
if (other.HasMulticlassNms) {
545+
MulticlassNms = other.MulticlassNms;
546+
}
502547
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
503548
}
504549

@@ -542,6 +587,10 @@ public void MergeFrom(pb::CodedInputStream input) {
542587
Algorithm = (global::Mediapipe.NonMaxSuppressionCalculatorOptions.Types.NmsAlgorithm) input.ReadEnum();
543588
break;
544589
}
590+
case 64: {
591+
MulticlassNms = input.ReadBool();
592+
break;
593+
}
545594
}
546595
}
547596
#endif
@@ -585,6 +634,10 @@ public void MergeFrom(pb::CodedInputStream input) {
585634
Algorithm = (global::Mediapipe.NonMaxSuppressionCalculatorOptions.Types.NmsAlgorithm) input.ReadEnum();
586635
break;
587636
}
637+
case 64: {
638+
MulticlassNms = input.ReadBool();
639+
break;
640+
}
588641
}
589642
}
590643
}

‎Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/Gpu/GpuOrigin.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,9 @@ public void MergeFrom(pb::CodedInputStream input) {
194194
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
195195
public static partial class Types {
196196
public enum Mode {
197+
/// <summary>
198+
/// Defaults to CONVENTIONAL
199+
/// </summary>
197200
[pbr::OriginalName("DEFAULT")] Default = 0,
198201
/// <summary>
199202
/// OpenGL: bottom-left origin

‎Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/Tasks/Vision/ObjectDetector/Proto/ObjectDetectorOptions.cs‎

Lines changed: 122 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,22 @@ static ObjectDetectorOptionsReflection() {
2929
"LnRhc2tzLnZpc2lvbi5vYmplY3RfZGV0ZWN0b3IucHJvdG8aJG1lZGlhcGlw",
3030
"ZS9mcmFtZXdvcmsvY2FsY3VsYXRvci5wcm90bxosbWVkaWFwaXBlL2ZyYW1l",
3131
"d29yay9jYWxjdWxhdG9yX29wdGlvbnMucHJvdG8aMG1lZGlhcGlwZS90YXNr",
32-
"cy9jYy9jb3JlL3Byb3RvL2Jhc2Vfb3B0aW9ucy5wcm90byLVAgoVT2JqZWN0",
32+
"cy9jYy9jb3JlL3Byb3RvL2Jhc2Vfb3B0aW9ucy5wcm90byKcAwoVT2JqZWN0",
3333
"RGV0ZWN0b3JPcHRpb25zEj0KDGJhc2Vfb3B0aW9ucxgBIAEoCzInLm1lZGlh",
3434
"cGlwZS50YXNrcy5jb3JlLnByb3RvLkJhc2VPcHRpb25zEiAKFGRpc3BsYXlf",
3535
"bmFtZXNfbG9jYWxlGAIgASgJOgJlbhIXCgttYXhfcmVzdWx0cxgDIAEoBToC",
3636
"LTESFwoPc2NvcmVfdGhyZXNob2xkGAQgASgCEhoKEmNhdGVnb3J5X2FsbG93",
37-
"bGlzdBgFIAMoCRIZChFjYXRlZ29yeV9kZW55bGlzdBgGIAMoCTJyCgNleHQS",
38-
"HC5tZWRpYXBpcGUuQ2FsY3VsYXRvck9wdGlvbnMYise50wEgASgLMkMubWVk",
39-
"aWFwaXBlLnRhc2tzLnZpc2lvbi5vYmplY3RfZGV0ZWN0b3IucHJvdG8uT2Jq",
40-
"ZWN0RGV0ZWN0b3JPcHRpb25zQlQKNmNvbS5nb29nbGUubWVkaWFwaXBlLnRh",
41-
"c2tzLnZpc2lvbi5vYmplY3RkZXRlY3Rvci5wcm90b0IaT2JqZWN0RGV0ZWN0",
42-
"b3JPcHRpb25zUHJvdG8="));
37+
"bGlzdBgFIAMoCRIZChFjYXRlZ29yeV9kZW55bGlzdBgGIAMoCRIdCg5tdWx0",
38+
"aWNsYXNzX25tcxgHIAEoCDoFZmFsc2USJgoZbWluX3N1cHByZXNzaW9uX3Ro",
39+
"cmVzaG9sZBgIIAEoAjoDMC4zMnIKA2V4dBIcLm1lZGlhcGlwZS5DYWxjdWxh",
40+
"dG9yT3B0aW9ucxiKx7nTASABKAsyQy5tZWRpYXBpcGUudGFza3MudmlzaW9u",
41+
"Lm9iamVjdF9kZXRlY3Rvci5wcm90by5PYmplY3REZXRlY3Rvck9wdGlvbnNC",
42+
"VAo2Y29tLmdvb2dsZS5tZWRpYXBpcGUudGFza3MudmlzaW9uLm9iamVjdGRl",
43+
"dGVjdG9yLnByb3RvQhpPYmplY3REZXRlY3Rvck9wdGlvbnNQcm90bw=="));
4344
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
4445
new pbr::FileDescriptor[] { global::Mediapipe.CalculatorReflection.Descriptor, global::Mediapipe.CalculatorOptionsReflection.Descriptor, global::Mediapipe.Tasks.Core.Proto.BaseOptionsReflection.Descriptor, },
4546
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
46-
new pbr::GeneratedClrTypeInfo(typeof(global::Mediapipe.Tasks.Vision.ObjectDetector.Proto.ObjectDetectorOptions), global::Mediapipe.Tasks.Vision.ObjectDetector.Proto.ObjectDetectorOptions.Parser, new[]{ "BaseOptions", "DisplayNamesLocale", "MaxResults", "ScoreThreshold", "CategoryAllowlist", "CategoryDenylist" }, null, null, new pb::Extension[] { global::Mediapipe.Tasks.Vision.ObjectDetector.Proto.ObjectDetectorOptions.Extensions.Ext }, null)
47+
new pbr::GeneratedClrTypeInfo(typeof(global::Mediapipe.Tasks.Vision.ObjectDetector.Proto.ObjectDetectorOptions), global::Mediapipe.Tasks.Vision.ObjectDetector.Proto.ObjectDetectorOptions.Parser, new[]{ "BaseOptions", "DisplayNamesLocale", "MaxResults", "ScoreThreshold", "CategoryAllowlist", "CategoryDenylist", "MulticlassNms", "MinSuppressionThreshold" }, null, null, new pb::Extension[] { global::Mediapipe.Tasks.Vision.ObjectDetector.Proto.ObjectDetectorOptions.Extensions.Ext }, null)
4748
}));
4849
}
4950
#endregion
@@ -92,6 +93,8 @@ public ObjectDetectorOptions(ObjectDetectorOptions other) : this() {
9293
scoreThreshold_ = other.scoreThreshold_;
9394
categoryAllowlist_ = other.categoryAllowlist_.Clone();
9495
categoryDenylist_ = other.categoryDenylist_.Clone();
96+
multiclassNms_ = other.multiclassNms_;
97+
minSuppressionThreshold_ = other.minSuppressionThreshold_;
9598
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
9699
}
97100

@@ -244,6 +247,69 @@ public void ClearScoreThreshold() {
244247
get { return categoryDenylist_; }
245248
}
246249

250+
/// <summary>Field number for the "multiclass_nms" field.</summary>
251+
public const int MulticlassNmsFieldNumber = 7;
252+
private readonly static bool MulticlassNmsDefaultValue = false;
253+
254+
private bool multiclassNms_;
255+
/// <summary>
256+
/// Whether to use multiclass NMS. That is, each category processes
257+
/// non-maximum-suppression separately.
258+
/// </summary>
259+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
260+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
261+
public bool MulticlassNms {
262+
get { if ((_hasBits0 & 4) != 0) { return multiclassNms_; } else { return MulticlassNmsDefaultValue; } }
263+
set {
264+
_hasBits0 |= 4;
265+
multiclassNms_ = value;
266+
}
267+
}
268+
/// <summary>Gets whether the "multiclass_nms" field is set</summary>
269+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
270+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
271+
public bool HasMulticlassNms {
272+
get { return (_hasBits0 & 4) != 0; }
273+
}
274+
/// <summary>Clears the value of the "multiclass_nms" field</summary>
275+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
276+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
277+
public void ClearMulticlassNms() {
278+
_hasBits0 &= ~4;
279+
}
280+
281+
/// <summary>Field number for the "min_suppression_threshold" field.</summary>
282+
public const int MinSuppressionThresholdFieldNumber = 8;
283+
private readonly static float MinSuppressionThresholdDefaultValue = 0.3F;
284+
285+
private float minSuppressionThreshold_;
286+
/// <summary>
287+
/// Overlapping threshold for non-maximum-suppression calculator. Only used for
288+
/// models without built-in non-maximum-suppression, i.e., models that don't
289+
/// use the Detection_Postprocess TFLite Op
290+
/// </summary>
291+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
292+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
293+
public float MinSuppressionThreshold {
294+
get { if ((_hasBits0 & 8) != 0) { return minSuppressionThreshold_; } else { return MinSuppressionThresholdDefaultValue; } }
295+
set {
296+
_hasBits0 |= 8;
297+
minSuppressionThreshold_ = value;
298+
}
299+
}
300+
/// <summary>Gets whether the "min_suppression_threshold" field is set</summary>
301+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
302+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
303+
public bool HasMinSuppressionThreshold {
304+
get { return (_hasBits0 & 8) != 0; }
305+
}
306+
/// <summary>Clears the value of the "min_suppression_threshold" field</summary>
307+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
308+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
309+
public void ClearMinSuppressionThreshold() {
310+
_hasBits0 &= ~8;
311+
}
312+
247313
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
248314
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
249315
public override bool Equals(object other) {
@@ -265,6 +331,8 @@ public bool Equals(ObjectDetectorOptions other) {
265331
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(ScoreThreshold, other.ScoreThreshold)) return false;
266332
if(!categoryAllowlist_.Equals(other.categoryAllowlist_)) return false;
267333
if(!categoryDenylist_.Equals(other.categoryDenylist_)) return false;
334+
if (MulticlassNms != other.MulticlassNms) return false;
335+
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(MinSuppressionThreshold, other.MinSuppressionThreshold)) return false;
268336
return Equals(_unknownFields, other._unknownFields);
269337
}
270338

@@ -278,6 +346,8 @@ public override int GetHashCode() {
278346
if (HasScoreThreshold) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(ScoreThreshold);
279347
hash ^= categoryAllowlist_.GetHashCode();
280348
hash ^= categoryDenylist_.GetHashCode();
349+
if (HasMulticlassNms) hash ^= MulticlassNms.GetHashCode();
350+
if (HasMinSuppressionThreshold) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(MinSuppressionThreshold);
281351
if (_unknownFields != null) {
282352
hash ^= _unknownFields.GetHashCode();
283353
}
@@ -314,6 +384,14 @@ public void WriteTo(pb::CodedOutputStream output) {
314384
}
315385
categoryAllowlist_.WriteTo(output, _repeated_categoryAllowlist_codec);
316386
categoryDenylist_.WriteTo(output, _repeated_categoryDenylist_codec);
387+
if (HasMulticlassNms) {
388+
output.WriteRawTag(56);
389+
output.WriteBool(MulticlassNms);
390+
}
391+
if (HasMinSuppressionThreshold) {
392+
output.WriteRawTag(69);
393+
output.WriteFloat(MinSuppressionThreshold);
394+
}
317395
if (_unknownFields != null) {
318396
_unknownFields.WriteTo(output);
319397
}
@@ -342,6 +420,14 @@ public void WriteTo(pb::CodedOutputStream output) {
342420
}
343421
categoryAllowlist_.WriteTo(ref output, _repeated_categoryAllowlist_codec);
344422
categoryDenylist_.WriteTo(ref output, _repeated_categoryDenylist_codec);
423+
if (HasMulticlassNms) {
424+
output.WriteRawTag(56);
425+
output.WriteBool(MulticlassNms);
426+
}
427+
if (HasMinSuppressionThreshold) {
428+
output.WriteRawTag(69);
429+
output.WriteFloat(MinSuppressionThreshold);
430+
}
345431
if (_unknownFields != null) {
346432
_unknownFields.WriteTo(ref output);
347433
}
@@ -366,6 +452,12 @@ public int CalculateSize() {
366452
}
367453
size += categoryAllowlist_.CalculateSize(_repeated_categoryAllowlist_codec);
368454
size += categoryDenylist_.CalculateSize(_repeated_categoryDenylist_codec);
455+
if (HasMulticlassNms) {
456+
size += 1 + 1;
457+
}
458+
if (HasMinSuppressionThreshold) {
459+
size += 1 + 4;
460+
}
369461
if (_unknownFields != null) {
370462
size += _unknownFields.CalculateSize();
371463
}
@@ -395,6 +487,12 @@ public void MergeFrom(ObjectDetectorOptions other) {
395487
}
396488
categoryAllowlist_.Add(other.categoryAllowlist_);
397489
categoryDenylist_.Add(other.categoryDenylist_);
490+
if (other.HasMulticlassNms) {
491+
MulticlassNms = other.MulticlassNms;
492+
}
493+
if (other.HasMinSuppressionThreshold) {
494+
MinSuppressionThreshold = other.MinSuppressionThreshold;
495+
}
398496
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
399497
}
400498

@@ -437,6 +535,14 @@ public void MergeFrom(pb::CodedInputStream input) {
437535
categoryDenylist_.AddEntriesFrom(input, _repeated_categoryDenylist_codec);
438536
break;
439537
}
538+
case 56: {
539+
MulticlassNms = input.ReadBool();
540+
break;
541+
}
542+
case 69: {
543+
MinSuppressionThreshold = input.ReadFloat();
544+
break;
545+
}
440546
}
441547
}
442548
#endif
@@ -479,6 +585,14 @@ public void MergeFrom(pb::CodedInputStream input) {
479585
categoryDenylist_.AddEntriesFrom(ref input, _repeated_categoryDenylist_codec);
480586
break;
481587
}
588+
case 56: {
589+
MulticlassNms = input.ReadBool();
590+
break;
591+
}
592+
case 69: {
593+
MinSuppressionThreshold = input.ReadFloat();
594+
break;
595+
}
482596
}
483597
}
484598
}

0 commit comments

Comments
 (0)