Skip to content

Commit 9eb3393

Browse files
homulerhomuler
committed
build: upgrade mediapipe to v0.10.26
1 parent 024c7ff commit 9eb3393

File tree

10 files changed

+1083
-121
lines changed

10 files changed

+1083
-121
lines changed

‎.bazelrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ test --test_env="GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1"
1313
build:linux --cxxopt=-std=c++17
1414
build:linux --host_cxxopt=-std=c++17
1515
build:linux --copt=-w
16+
# build:linux --define=xnn_enable_avx512amx=false
1617

1718
# windows
1819
build:windows --cxxopt=/std:c++17
@@ -26,6 +27,7 @@ build:windows --host_copt=/D_USE_MATH_DEFINES
2627
build:macos --cxxopt=-std=c++17
2728
build:macos --host_cxxopt=-std=c++17
2829
build:macos --copt=-w
30+
build:macos --define=xnn_enable_avx512amx=false
2931

3032
# Sets the default Apple platform to macOS.
3133
build --apple_platform_type=macos

‎Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/Calculators/Audio/SpectrogramCalculator.cs‎

Lines changed: 82 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static SpectrogramCalculatorReflection() {
2626
string.Concat(
2727
"CjhtZWRpYXBpcGUvY2FsY3VsYXRvcnMvYXVkaW8vc3BlY3Ryb2dyYW1fY2Fs",
2828
"Y3VsYXRvci5wcm90bxIJbWVkaWFwaXBlGiRtZWRpYXBpcGUvZnJhbWV3b3Jr",
29-
"L2NhbGN1bGF0b3IucHJvdG8isAYKHFNwZWN0cm9ncmFtQ2FsY3VsYXRvck9w",
29+
"L2NhbGN1bGF0b3IucHJvdG8ikAgKHFNwZWN0cm9ncmFtQ2FsY3VsYXRvck9w",
3030
"dGlvbnMSHgoWZnJhbWVfZHVyYXRpb25fc2Vjb25kcxgBIAEoARIgChVmcmFt",
3131
"ZV9vdmVybGFwX3NlY29uZHMYAiABKAE6ATASHgoQcGFkX2ZpbmFsX3BhY2tl",
3232
"dBgDIAEoCDoEdHJ1ZRJaCgtvdXRwdXRfdHlwZRgEIAEoDjIyLm1lZGlhcGlw",
@@ -38,17 +38,22 @@ static SpectrogramCalculatorReflection() {
3838
"YW1wGAggASgIOgVmYWxzZRITCghmZnRfc2l6ZRgJIAEoBToBMBIWCgtpbnB1",
3939
"dF9zY2FsZRgKIAEoAjoBMRJaChJzYW1wbGVfYnVmZmVyX21vZGUYCyABKA4y",
4040
"OC5tZWRpYXBpcGUuU3BlY3Ryb2dyYW1DYWxjdWxhdG9yT3B0aW9ucy5TYW1w",
41-
"bGVCdWZmZXJNb2RlOgROT05FIlQKCk91dHB1dFR5cGUSFQoRU1FVQVJFRF9N",
42-
"QUdOSVRVREUQABIUChBMSU5FQVJfTUFHTklUVURFEAESDAoIREVDSUJFTFMQ",
43-
"AhILCgdDT01QTEVYEAMiPgoKV2luZG93VHlwZRIICgRIQU5OEAASCwoHSEFN",
44-
"TUlORxABEgoKBkNPU0lORRACEg0KCVNRUlRfSEFOThAEIicKEFNhbXBsZUJ1",
45-
"ZmZlck1vZGUSCAoETk9ORRAAEgkKBVJFU0VUEAEyVQoDZXh0EhwubWVkaWFw",
46-
"aXBlLkNhbGN1bGF0b3JPcHRpb25zGMCIqiQgASgLMicubWVkaWFwaXBlLlNw",
47-
"ZWN0cm9ncmFtQ2FsY3VsYXRvck9wdGlvbnM="));
41+
"bGVCdWZmZXJNb2RlOgROT05FEmoKDW91dHB1dF9sYXlvdXQYDSABKA4yNC5t",
42+
"ZWRpYXBpcGUuU3BlY3Ryb2dyYW1DYWxjdWxhdG9yT3B0aW9ucy5PdXRwdXRM",
43+
"YXlvdXQ6HVNQRUNUUk9HUkFNX0ZSQU1FU19JTl9DT0xVTU5TIlQKCk91dHB1",
44+
"dFR5cGUSFQoRU1FVQVJFRF9NQUdOSVRVREUQABIUChBMSU5FQVJfTUFHTklU",
45+
"VURFEAESDAoIREVDSUJFTFMQAhILCgdDT01QTEVYEAMiPgoKV2luZG93VHlw",
46+
"ZRIICgRIQU5OEAASCwoHSEFNTUlORxABEgoKBkNPU0lORRACEg0KCVNRUlRf",
47+
"SEFOThAEIicKEFNhbXBsZUJ1ZmZlck1vZGUSCAoETk9ORRAAEgkKBVJFU0VU",
48+
"EAEicgoMT3V0cHV0TGF5b3V0Eh0KGU9VVFBVVF9MQVlPVVRfVU5TUEVDSUZJ",
49+
"RUQQABIhCh1TUEVDVFJPR1JBTV9GUkFNRVNfSU5fQ09MVU1OUxABEiAKHFNQ",
50+
"RUNUUk9HUkFNX0NIQU5ORUxTX0lOX1JPV1MQAjJVCgNleHQSHC5tZWRpYXBp",
51+
"cGUuQ2FsY3VsYXRvck9wdGlvbnMYwIiqJCABKAsyJy5tZWRpYXBpcGUuU3Bl",
52+
"Y3Ryb2dyYW1DYWxjdWxhdG9yT3B0aW9ucw=="));
4853
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
4954
new pbr::FileDescriptor[] { global::Mediapipe.CalculatorReflection.Descriptor, },
5055
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
51-
new pbr::GeneratedClrTypeInfo(typeof(global::Mediapipe.SpectrogramCalculatorOptions), global::Mediapipe.SpectrogramCalculatorOptions.Parser, new[]{ "FrameDurationSeconds", "FrameOverlapSeconds", "PadFinalPacket", "OutputType", "AllowMultichannelInput", "WindowType", "OutputScale", "UseLocalTimestamp", "FftSize", "InputScale", "SampleBufferMode" }, null, new[]{ typeof(global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputType), typeof(global::Mediapipe.SpectrogramCalculatorOptions.Types.WindowType), typeof(global::Mediapipe.SpectrogramCalculatorOptions.Types.SampleBufferMode) }, new pb::Extension[] { global::Mediapipe.SpectrogramCalculatorOptions.Extensions.Ext }, null)
56+
new pbr::GeneratedClrTypeInfo(typeof(global::Mediapipe.SpectrogramCalculatorOptions), global::Mediapipe.SpectrogramCalculatorOptions.Parser, new[]{ "FrameDurationSeconds", "FrameOverlapSeconds", "PadFinalPacket", "OutputType", "AllowMultichannelInput", "WindowType", "OutputScale", "UseLocalTimestamp", "FftSize", "InputScale", "SampleBufferMode", "OutputLayout" }, null, new[]{ typeof(global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputType), typeof(global::Mediapipe.SpectrogramCalculatorOptions.Types.WindowType), typeof(global::Mediapipe.SpectrogramCalculatorOptions.Types.SampleBufferMode), typeof(global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputLayout) }, new pb::Extension[] { global::Mediapipe.SpectrogramCalculatorOptions.Extensions.Ext }, null)
5257
}));
5358
}
5459
#endregion
@@ -102,6 +107,7 @@ public SpectrogramCalculatorOptions(SpectrogramCalculatorOptions other) : this()
102107
fftSize_ = other.fftSize_;
103108
inputScale_ = other.inputScale_;
104109
sampleBufferMode_ = other.sampleBufferMode_;
110+
outputLayout_ = other.outputLayout_;
105111
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
106112
}
107113

@@ -450,6 +456,33 @@ public void ClearSampleBufferMode() {
450456
_hasBits0 &= ~1024;
451457
}
452458

459+
/// <summary>Field number for the "output_layout" field.</summary>
460+
public const int OutputLayoutFieldNumber = 13;
461+
private readonly static global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputLayout OutputLayoutDefaultValue = global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputLayout.SpectrogramFramesInColumns;
462+
463+
private global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputLayout outputLayout_;
464+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
465+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
466+
public global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputLayout OutputLayout {
467+
get { if ((_hasBits0 & 2048) != 0) { return outputLayout_; } else { return OutputLayoutDefaultValue; } }
468+
set {
469+
_hasBits0 |= 2048;
470+
outputLayout_ = value;
471+
}
472+
}
473+
/// <summary>Gets whether the "output_layout" field is set</summary>
474+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
475+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
476+
public bool HasOutputLayout {
477+
get { return (_hasBits0 & 2048) != 0; }
478+
}
479+
/// <summary>Clears the value of the "output_layout" field</summary>
480+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
481+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
482+
public void ClearOutputLayout() {
483+
_hasBits0 &= ~2048;
484+
}
485+
453486
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
454487
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
455488
public override bool Equals(object other) {
@@ -476,6 +509,7 @@ public bool Equals(SpectrogramCalculatorOptions other) {
476509
if (FftSize != other.FftSize) return false;
477510
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(InputScale, other.InputScale)) return false;
478511
if (SampleBufferMode != other.SampleBufferMode) return false;
512+
if (OutputLayout != other.OutputLayout) return false;
479513
return Equals(_unknownFields, other._unknownFields);
480514
}
481515

@@ -494,6 +528,7 @@ public override int GetHashCode() {
494528
if (HasFftSize) hash ^= FftSize.GetHashCode();
495529
if (HasInputScale) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(InputScale);
496530
if (HasSampleBufferMode) hash ^= SampleBufferMode.GetHashCode();
531+
if (HasOutputLayout) hash ^= OutputLayout.GetHashCode();
497532
if (_unknownFields != null) {
498533
hash ^= _unknownFields.GetHashCode();
499534
}
@@ -556,6 +591,10 @@ public void WriteTo(pb::CodedOutputStream output) {
556591
output.WriteRawTag(88);
557592
output.WriteEnum((int) SampleBufferMode);
558593
}
594+
if (HasOutputLayout) {
595+
output.WriteRawTag(104);
596+
output.WriteEnum((int) OutputLayout);
597+
}
559598
if (_unknownFields != null) {
560599
_unknownFields.WriteTo(output);
561600
}
@@ -610,6 +649,10 @@ public void WriteTo(pb::CodedOutputStream output) {
610649
output.WriteRawTag(88);
611650
output.WriteEnum((int) SampleBufferMode);
612651
}
652+
if (HasOutputLayout) {
653+
output.WriteRawTag(104);
654+
output.WriteEnum((int) OutputLayout);
655+
}
613656
if (_unknownFields != null) {
614657
_unknownFields.WriteTo(ref output);
615658
}
@@ -653,6 +696,9 @@ public int CalculateSize() {
653696
if (HasSampleBufferMode) {
654697
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SampleBufferMode);
655698
}
699+
if (HasOutputLayout) {
700+
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) OutputLayout);
701+
}
656702
if (_unknownFields != null) {
657703
size += _unknownFields.CalculateSize();
658704
}
@@ -698,6 +744,9 @@ public void MergeFrom(SpectrogramCalculatorOptions other) {
698744
if (other.HasSampleBufferMode) {
699745
SampleBufferMode = other.SampleBufferMode;
700746
}
747+
if (other.HasOutputLayout) {
748+
OutputLayout = other.OutputLayout;
749+
}
701750
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
702751
}
703752

@@ -757,6 +806,10 @@ public void MergeFrom(pb::CodedInputStream input) {
757806
SampleBufferMode = (global::Mediapipe.SpectrogramCalculatorOptions.Types.SampleBufferMode) input.ReadEnum();
758807
break;
759808
}
809+
case 104: {
810+
OutputLayout = (global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputLayout) input.ReadEnum();
811+
break;
812+
}
760813
}
761814
}
762815
#endif
@@ -816,6 +869,10 @@ public void MergeFrom(pb::CodedInputStream input) {
816869
SampleBufferMode = (global::Mediapipe.SpectrogramCalculatorOptions.Types.SampleBufferMode) input.ReadEnum();
817870
break;
818871
}
872+
case 104: {
873+
OutputLayout = (global::Mediapipe.SpectrogramCalculatorOptions.Types.OutputLayout) input.ReadEnum();
874+
break;
875+
}
819876
}
820877
}
821878
}
@@ -874,6 +931,22 @@ public enum SampleBufferMode {
874931
[pbr::OriginalName("RESET")] Reset = 1,
875932
}
876933

934+
public enum OutputLayout {
935+
[pbr::OriginalName("OUTPUT_LAYOUT_UNSPECIFIED")] Unspecified = 0,
936+
/// <summary>
937+
/// Output is a matrix or a vector of matrices. Within the matrix, each
938+
/// column represents the spectrogram for a frame. If the input has multiple
939+
/// channels, the output will be a vector of matrices, each matrix
940+
/// corresponding to a channel.
941+
/// </summary>
942+
[pbr::OriginalName("SPECTROGRAM_FRAMES_IN_COLUMNS")] SpectrogramFramesInColumns = 1,
943+
/// <summary>
944+
/// Output is a one matrix per packet. Within the matrix, each row represents
945+
/// a channel.
946+
/// </summary>
947+
[pbr::OriginalName("SPECTROGRAM_CHANNELS_IN_ROWS")] SpectrogramChannelsInRows = 2,
948+
}
949+
877950
}
878951
#endregion
879952

0 commit comments

Comments
 (0)