Skip to content

Commit

Permalink
fix: correct the order of the capability list (#3189)
Browse files Browse the repository at this point in the history
* fix: correct the order of the capability list

This commit addresses an issue where the capability list was ordered
incorrectly, which was introduced in
https://github.com/livepeer/go-livepeer/pull/3114/files. The incorrect ordering
caused a break in the SAM2 pipeline, which is now resolved.

* Refactor Capabilities to use const values instead of iota

* Refactor Capabilities to use const values instead of iota

---------

Co-authored-by: Rafał Leszko <[email protected]>
  • Loading branch information
rickstaa and leszko authored Oct 2, 2024
1 parent 80c0ac9 commit 93bec37
Showing 1 changed file with 37 additions and 38 deletions.
75 changes: 37 additions & 38 deletions core/capabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,44 +42,43 @@ type CapabilityTest struct {
outProfile ffmpeg.VideoProfile
}

// Do not rearrange these values! Only append.
const (
Capability_Invalid Capability = iota - 2
Capability_Unused
Capability_H264
Capability_MPEGTS
Capability_MP4
Capability_FractionalFramerates
Capability_StorageDirect
Capability_StorageS3
Capability_StorageGCS
Capability_ProfileH264Baseline
Capability_ProfileH264Main
Capability_ProfileH264High
Capability_ProfileH264ConstrainedHigh
Capability_GOP
Capability_AuthToken
Capability_SceneClassification // Deprecated, but can't remove because of Capability ordering
Capability_MPEG7VideoSignature
Capability_HEVC_Decode
Capability_HEVC_Encode
Capability_VP8_Decode
Capability_VP9_Decode
Capability_VP8_Encode
Capability_VP9_Encode
Capability_H264_Decode_444_8bit
Capability_H264_Decode_422_8bit
Capability_H264_Decode_444_10bit
Capability_H264_Decode_422_10bit
Capability_H264_Decode_420_10bit
Capability_SegmentSlicing
Capability_TextToImage
Capability_ImageToImage
Capability_ImageToVideo
Capability_Upscale
Capability_AudioToText
Capability_LLM
Capability_SegmentAnything2
Capability_Invalid Capability = -2
Capability_Unused Capability = -1
Capability_H264 Capability = 0
Capability_MPEGTS Capability = 1
Capability_MP4 Capability = 2
Capability_FractionalFramerates Capability = 3
Capability_StorageDirect Capability = 4
Capability_StorageS3 Capability = 5
Capability_StorageGCS Capability = 6
Capability_ProfileH264Baseline Capability = 7
Capability_ProfileH264Main Capability = 8
Capability_ProfileH264High Capability = 9
Capability_ProfileH264ConstrainedHigh Capability = 10
Capability_GOP Capability = 11
Capability_AuthToken Capability = 12
Capability_SceneClassification Capability = 13 // Deprecated, but can't remove because of Capability ordering
Capability_MPEG7VideoSignature Capability = 14
Capability_HEVC_Decode Capability = 15
Capability_HEVC_Encode Capability = 16
Capability_VP8_Decode Capability = 17
Capability_VP9_Decode Capability = 18
Capability_VP8_Encode Capability = 19
Capability_VP9_Encode Capability = 20
Capability_H264_Decode_444_8bit Capability = 21
Capability_H264_Decode_422_8bit Capability = 22
Capability_H264_Decode_444_10bit Capability = 23
Capability_H264_Decode_422_10bit Capability = 24
Capability_H264_Decode_420_10bit Capability = 25
Capability_SegmentSlicing Capability = 26
Capability_TextToImage Capability = 27
Capability_ImageToImage Capability = 28
Capability_ImageToVideo Capability = 29
Capability_Upscale Capability = 30
Capability_AudioToText Capability = 31
Capability_SegmentAnything2 Capability = 32
Capability_LLM Capability = 33
)

var CapabilityNameLookup = map[Capability]string{
Expand Down Expand Up @@ -116,8 +115,8 @@ var CapabilityNameLookup = map[Capability]string{
Capability_ImageToVideo: "Image to video",
Capability_Upscale: "Upscale",
Capability_AudioToText: "Audio to text",
Capability_LLM: "Large language model",
Capability_SegmentAnything2: "Segment anything 2",
Capability_LLM: "Large language model",
}

var CapabilityTestLookup = map[Capability]CapabilityTest{
Expand Down

0 comments on commit 93bec37

Please sign in to comment.