Skip to content

Commit 6d582dd

Browse files
seanavery10zingpd
authored andcommitted
Default to x264 on arm64/linux (#3283)
1 parent 6f7ce67 commit 6d582dd

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

web/server/entrypoint_arm64.go

+2-12
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,14 @@ package server
44

55
import (
66
"go.viam.com/rdk/gostream"
7-
"go.viam.com/rdk/gostream/codec/h264"
87
"go.viam.com/rdk/gostream/codec/opus"
98
"go.viam.com/rdk/gostream/codec/x264"
109
)
1110

1211
func makeStreamConfig() gostream.StreamConfig {
1312
var streamConfig gostream.StreamConfig
14-
15-
// Attempt to create a new encoder with hardcoded parameters
16-
// to check if V4l2m2m codec is supported.
17-
width, height, keyFrameInterval := 1920, 1080, 30
18-
_, err := h264.NewEncoder(width, height, keyFrameInterval, nil)
19-
if err != nil {
20-
streamConfig.VideoEncoderFactory = x264.NewEncoderFactory()
21-
} else {
22-
streamConfig.VideoEncoderFactory = h264.NewEncoderFactory()
23-
}
24-
13+
// TODO(RSDK-5916): support v4l2m2m codec on arm64/rpi
14+
streamConfig.VideoEncoderFactory = x264.NewEncoderFactory()
2515
streamConfig.AudioEncoderFactory = opus.NewEncoderFactory()
2616
return streamConfig
2717
}

0 commit comments

Comments
 (0)