From 825b3e2034aef7856c50f62e249e571baef60c2b Mon Sep 17 00:00:00 2001 From: Josh Allmann Date: Wed, 7 Aug 2024 09:15:51 -0700 Subject: [PATCH] core: Rename 'InArray' to 'HasCapability' (#3118) --- core/capabilities.go | 2 +- core/capabilities_test.go | 20 ++++++++++---------- core/transcoder.go | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/capabilities.go b/core/capabilities.go index 7bd4f00f5f..e626fc54a1 100644 --- a/core/capabilities.go +++ b/core/capabilities.go @@ -496,7 +496,7 @@ func CapabilityToName(capability Capability) (string, error) { return capName, nil } -func InArray(capability Capability, caps []Capability) bool { +func HasCapability(caps []Capability, capability Capability) bool { for _, c := range caps { if capability == c { return true diff --git a/core/capabilities_test.go b/core/capabilities_test.go index b165a3d9ca..8985565078 100644 --- a/core/capabilities_test.go +++ b/core/capabilities_test.go @@ -148,22 +148,22 @@ func TestCapability_TranscoderCapabilities(t *testing.T) { if devicesAvailable { nvidiaCaps, err := TestTranscoderCapabilities(devices, NewNvidiaTranscoder) assert.Nil(t, err) - assert.False(t, InArray(Capability_H264_Decode_444_8bit, nvidiaCaps), "Nvidia device should not support decode of 444_8bit") - assert.False(t, InArray(Capability_H264_Decode_422_8bit, nvidiaCaps), "Nvidia device should not support decode of 422_8bit") - assert.False(t, InArray(Capability_H264_Decode_444_10bit, nvidiaCaps), "Nvidia device should not support decode of 444_10bit") - assert.False(t, InArray(Capability_H264_Decode_422_10bit, nvidiaCaps), "Nvidia device should not support decode of 422_10bit") - assert.False(t, InArray(Capability_H264_Decode_420_10bit, nvidiaCaps), "Nvidia device should not support decode of 420_10bit") + assert.False(t, HasCapability(nvidiaCaps, Capability_H264_Decode_444_8bit), "Nvidia device should not support decode of 444_8bit") + assert.False(t, HasCapability(nvidiaCaps, Capability_H264_Decode_422_8bit), "Nvidia device should not support decode of 422_8bit") + assert.False(t, HasCapability(nvidiaCaps, Capability_H264_Decode_444_10bit), "Nvidia device should not support decode of 444_10bit") + assert.False(t, HasCapability(nvidiaCaps, Capability_H264_Decode_422_10bit), "Nvidia device should not support decode of 422_10bit") + assert.False(t, HasCapability(nvidiaCaps, Capability_H264_Decode_420_10bit), "Nvidia device should not support decode of 420_10bit") } // Same test with software transcoder: softwareCaps, err := TestSoftwareTranscoderCapabilities(tmpdir) assert.Nil(t, err) // Software transcoder supports: [h264_444_8bit h264_422_8bit h264_444_10bit h264_422_10bit h264_420_10bit] - assert.True(t, InArray(Capability_H264_Decode_444_8bit, softwareCaps), "software decoder should support 444_8bit input") - assert.True(t, InArray(Capability_H264_Decode_422_8bit, softwareCaps), "software decoder should support 422_8bit input") - assert.True(t, InArray(Capability_H264_Decode_444_10bit, softwareCaps), "software decoder should support 444_10bit input") - assert.True(t, InArray(Capability_H264_Decode_422_10bit, softwareCaps), "software decoder should support 422_10bit input") - assert.True(t, InArray(Capability_H264_Decode_420_10bit, softwareCaps), "software decoder should support 420_10bit input") + assert.True(t, HasCapability(softwareCaps, Capability_H264_Decode_444_8bit), "software decoder should support 444_8bit input") + assert.True(t, HasCapability(softwareCaps, Capability_H264_Decode_422_8bit), "software decoder should support 422_8bit input") + assert.True(t, HasCapability(softwareCaps, Capability_H264_Decode_444_10bit), "software decoder should support 444_10bit input") + assert.True(t, HasCapability(softwareCaps, Capability_H264_Decode_422_10bit), "software decoder should support 422_10bit input") + assert.True(t, HasCapability(softwareCaps, Capability_H264_Decode_420_10bit), "software decoder should support 420_10bit input") } func TestCapability_JobCapabilities(t *testing.T) { diff --git a/core/transcoder.go b/core/transcoder.go index e91aa56693..79458a5b83 100644 --- a/core/transcoder.go +++ b/core/transcoder.go @@ -172,7 +172,7 @@ type transcodeTestParams struct { } func (params transcodeTestParams) IsRequired() bool { - return InArray(params.Cap, DefaultCapabilities()) + return HasCapability(DefaultCapabilities(), params.Cap) } func (params transcodeTestParams) Kind() string {