rename video/audio profile config 'codec' to 'encoder'

The earlier change to 'codec' was based on a misunderstanding. This actually tells ffmpeg which encoder to use, so this identifier is more accurate.

Example: 'copy' ("don't change anything") is a valid encoder, but it's clearly not a codec.

Author: hheimbuerger

README.md

@@ -111,7 +111,7 @@ vod:
       height: 1080
       bitrate: 5000
       # Optional ffmpeg video overrides
-      codec: h264_nvenc   # default "libx264"
+      encoder: h264_nvenc   # default "libx264"
       preset: p1          # default "faster"
       profile: high       # default "high"
       level: auto         # default "4.0"
@@ -131,7 +131,7 @@ vod:
   video-keyframes: false
   # Single audio profile used
   audio-profile:
-    codec: aac    # default "aac", but "copy" is an alternative
+    encoder: aac    # default "aac", but "copy" is an alternative
     bitrate: 192  # kbps
   # If cache is enabled
   cache: true

hlsvod/transcode.go

@@ -28,16 +28,16 @@ type VideoProfile struct {
 	Bitrate int // in kilobytes
 
 	// Optional FFmpeg overrides
-	Codec     string
+	Encoder   string
 	Preset    string
 	Profile   string
 	Level     string
 	ExtraArgs []string
 }
 
 type AudioProfile struct {
-	Codec   string // audio codec (e.g., "aac", "copy", "libopus")
-	Bitrate int    // in kilobytes (0 means use codec default)
+	Encoder string // audio encoder (e.g., "aac", "copy", "libopus")
+	Bitrate int    // in kilobytes (0 means use encoder default)
 }
 
 // returns a channel, that delivers name of the segments as they are encoded
@@ -98,9 +98,9 @@ func TranscodeSegments(ctx context.Context, ffmpegBinary string, config Transcod
 		}
 
 		// apply defaults if empty
-		codec := profile.Codec
-		if codec == "" {
-			codec = "libx264"
+		encoder := profile.Encoder
+		if encoder == "" {
+			encoder = "libx264"
 		}
 		preset := profile.Preset
 		if preset == "" {
@@ -117,7 +117,7 @@ func TranscodeSegments(ctx context.Context, ffmpegBinary string, config Transcod
 
 		args = append(args, []string{
 			"-vf", scale,
-			"-c:v", codec,
+			"-c:v", encoder,
 			"-preset", preset,
 			"-profile:v", prof,
 			"-level:v", lvl,
@@ -142,8 +142,8 @@ func TranscodeSegments(ctx context.Context, ffmpegBinary string, config Transcod
 	// Audio specs
 	if config.AudioProfile != nil {
 		profile := config.AudioProfile
-		if profile.Codec != "" {
-			args = append(args, "-c:a", profile.Codec)
+		if profile.Encoder != "" {
+			args = append(args, "-c:a", profile.Encoder)
 			if profile.Bitrate > 0 {
 				args = append(args, "-b:a", fmt.Sprintf("%dk", profile.Bitrate))
 			}

internal/api/hlsvod.go

@@ -147,7 +147,7 @@ func (a *ApiManagerCtx) HlsVod(r chi.Router) {
 					Width:   profile.Width,
 					Height:  profile.Height,
 					Bitrate: profile.Bitrate,
-					Codec:   profile.Codec,
+					Encoder:   profile.Encoder,
 					Preset:  profile.Preset,
 					Profile: profile.Profile,
 					Level:   profile.Level,

internal/config/config.go

@@ -49,15 +49,16 @@ type VideoProfile struct {
 	Bitrate int `mapstructure:"bitrate"` // in kilobytes
 
 	// Optional FFmpeg overrides
-	Codec     string   `mapstructure:"codec"`
+	Encoder   string   `mapstructure:"encoder"`
 	Preset    string   `mapstructure:"preset"`
 	Profile   string   `mapstructure:"profile"`
 	Level     string   `mapstructure:"level"`
 	ExtraArgs []string `mapstructure:"extra-args"`
 }
 
 type AudioProfile struct {
-	Bitrate int `mapstructure:"bitrate"` // in kilobytes
+	Encoder string `mapstructure:"encoder"`
+	Bitrate int    `mapstructure:"bitrate"` // in kilobytes
 }
 
 type VOD struct {
@@ -267,8 +268,8 @@ func (s *Server) Set() {
 
 	// apply defaults to each video profile
 	for k, vp := range s.Vod.VideoProfiles {
-		if vp.Codec == "" {
-			vp.Codec = "libx264"
+		if vp.Encoder == "" {
+			vp.Encoder = "libx264"
 		}
 		if vp.Preset == "" {
 			vp.Preset = "faster"