video publisher more options

pi/roverd/config.go

@@ -93,17 +93,18 @@ type VideoMediaConfig struct {
 	// Publisher selects the installed publisher script/pipeline family. The
 	// first pass uses pi-libcamera for current rovers; laptop-v4l2 can be added
 	// without changing the server-facing media shape again.
-	Enabled    bool   `yaml:"enabled" json:"enabled"`
-	Service    string `yaml:"service" json:"service,omitempty"`
-	Publisher  string `yaml:"publisher" json:"publisher,omitempty"`
-	PublishURL string `yaml:"publishUrl" json:"publishUrl,omitempty"`
-	Device     string `yaml:"device" json:"device,omitempty"`
-	Width      int    `yaml:"width" json:"-"`
-	Height     int    `yaml:"height" json:"-"`
-	FPS        int    `yaml:"fps" json:"-"`
-	Bitrate    int    `yaml:"bitrate" json:"-"`
-	Inverted   bool   `yaml:"inverted" json:"-"`
-	SensorMode string `yaml:"sensorMode" json:"-"`
+	Enabled     bool   `yaml:"enabled" json:"enabled"`
+	Service     string `yaml:"service" json:"service,omitempty"`
+	Publisher   string `yaml:"publisher" json:"publisher,omitempty"`
+	PublishURL  string `yaml:"publishUrl" json:"publishUrl,omitempty"`
+	Device      string `yaml:"device" json:"device,omitempty"`
+	InputFormat string `yaml:"inputFormat" json:"-"`
+	Width       int    `yaml:"width" json:"-"`
+	Height      int    `yaml:"height" json:"-"`
+	FPS         int    `yaml:"fps" json:"-"`
+	Bitrate     int    `yaml:"bitrate" json:"-"`
+	Inverted    bool   `yaml:"inverted" json:"-"`
+	SensorMode  string `yaml:"sensorMode" json:"-"`
 }
 
 type AudioCaptureConfig struct {
@@ -450,6 +451,10 @@ func validateVideoMediaConfig(cfg *VideoMediaConfig, serverURL string, roverName
 	if cfg.Publisher == "" {
 		cfg.Publisher = "pi-libcamera"
 	}
+	// V4L2 input formats are consumed by ffmpeg as lowercase names such as
+	// mjpeg or yuyv422. Normalizing here keeps the publisher script simple and
+	// makes hand-edited Debian laptop configs less sensitive to capitalization.
+	cfg.InputFormat = strings.ToLower(strings.TrimSpace(cfg.InputFormat))
 	if cfg.Width <= 0 {
 		cfg.Width = 640
 	}

pi/roverd/media_env.go

@@ -36,6 +36,7 @@ func UpdatePublisherEnv(media MediaConfig) error {
 	fmt.Fprintf(&buf, "ROVERD_VIDEO_PUBLISHER=%s\n", media.Video.Publisher)
 	fmt.Fprintf(&buf, "ROVERD_VIDEO_PUBLISH_URL=%s\n", media.Video.PublishURL)
 	fmt.Fprintf(&buf, "ROVERD_VIDEO_DEVICE=%s\n", media.Video.Device)
+	fmt.Fprintf(&buf, "ROVERD_VIDEO_INPUT_FORMAT=%s\n", media.Video.InputFormat)
 	fmt.Fprintf(&buf, "ROVERD_VIDEO_WIDTH=%d\n", media.Video.Width)
 	fmt.Fprintf(&buf, "ROVERD_VIDEO_HEIGHT=%d\n", media.Video.Height)
 	fmt.Fprintf(&buf, "ROVERD_VIDEO_FPS=%d\n", media.Video.FPS)

pi/roverd/roverd.debian-laptop.sample.yaml

@@ -31,6 +31,10 @@ media:
     service: debian-laptop-video-publisher.service
     publisher: debian-laptop-v4l2
     device: /dev/video0
+    # Check supported values with:
+    #   v4l2-ctl --device=/dev/video0 --list-formats-ext
+    # Common working values are mjpeg and yuyv422.
+    inputFormat: mjpeg
     width: 640
     height: 480
     fps: 30