Fix VAAPI profile and audio stream mapping

Author: tces1

internal/transcode/ffmpeg_args_test.go

@@ -206,6 +206,28 @@ func TestBuildFFmpegArgsUsesVAAPIEncodeFallbackPipeline(t *testing.T) {
 	}
 }
 
+func TestBuildFFmpegArgsDoesNotForceVAAPIH264Profile(t *testing.T) {
+	session := &Session{
+		ID:  "item123",
+		Dir: t.TempDir(),
+	}
+	request := Request{InputURL: "http://upstream/stream"}
+
+	for _, pipeline := range []string{"vaapi-full", "vaapi-encode"} {
+		t.Run(pipeline, func(t *testing.T) {
+			args := buildFFmpegArgs(session, request, FFmpegOptions{
+				HardwareDecode:   "vaapi",
+				HardwareDevice:   "/dev/dri/renderD128",
+				HardwarePipeline: pipeline,
+			})
+
+			if slices.Contains(args, "-profile:v") {
+				t.Fatalf("VAAPI pipeline should not force H.264 profile: %v", args)
+			}
+		})
+	}
+}
+
 func TestBuildFFmpegArgsCapsVideoOutputTo1080p(t *testing.T) {
 	session := &Session{
 		ID:  "item123",
@@ -227,7 +249,7 @@ func TestBuildFFmpegArgsCapsVideoOutputTo1080p(t *testing.T) {
 	}
 }
 
-func TestBuildFFmpegArgsMapsFirstAudioStreamReturnedByEmby(t *testing.T) {
+func TestBuildFFmpegArgsMapsFirstAudioStreamWhenNoAudioStreamIndexRequested(t *testing.T) {
 	session := &Session{
 		ID:  "item123",
 		Dir: t.TempDir(),
@@ -238,6 +260,30 @@ func TestBuildFFmpegArgsMapsFirstAudioStreamReturnedByEmby(t *testing.T) {
 			},
 		},
 	}
+	request := Request{InputURL: "http://upstream/stream"}
+
+	args := buildFFmpegArgs(session, request)
+
+	mapIndexes := allIndexes(args, "-map")
+	if len(mapIndexes) < 2 {
+		t.Fatalf("missing map args: %v", args)
+	}
+	if got := args[mapIndexes[1]+1]; got != "0:a:0?" {
+		t.Fatalf("audio map = %q, args=%v", got, args)
+	}
+}
+
+func TestBuildFFmpegArgsMapsRequestedAudioStreamIndex(t *testing.T) {
+	session := &Session{
+		ID:  "item123",
+		Dir: t.TempDir(),
+		Media: MediaInfo{
+			AudioStreams: []AudioStreamInfo{
+				{Index: 1, Ordinal: 0, Codec: "aac"},
+				{Index: 2, Ordinal: 1, Codec: "eac3"},
+			},
+		},
+	}
 	request := Request{
 		InputURL:         "http://upstream/stream?AudioStreamIndex=2",
 		AudioStreamIndex: 2,
@@ -249,7 +295,7 @@ func TestBuildFFmpegArgsMapsFirstAudioStreamReturnedByEmby(t *testing.T) {
 	if len(mapIndexes) < 2 {
 		t.Fatalf("missing map args: %v", args)
 	}
-	if got := args[mapIndexes[1]+1]; got != "0:a:0?" {
+	if got := args[mapIndexes[1]+1]; got != "0:a:1?" {
 		t.Fatalf("audio map = %q, args=%v", got, args)
 	}
 }

internal/transcode/manager.go

@@ -1249,7 +1249,6 @@ func appendVideoTranscodeArgs(args []string, options FFmpegOptions) []string {
 	case "vaapi-full":
 		return append(args,
 			"-c:v", "h264_vaapi",
-			"-profile:v", "high",
 			"-g", strconv.Itoa(lowLatencyGOP),
 			"-keyint_min", strconv.Itoa(lowLatencyGOP),
 			"-bf", "0",
@@ -1259,7 +1258,6 @@ func appendVideoTranscodeArgs(args []string, options FFmpegOptions) []string {
 		return append(args,
 			"-vf", softwareScaleFilter(maxTranscodeWidth, maxTranscodeHeight)+",format=nv12,hwupload",
 			"-c:v", "h264_vaapi",
-			"-profile:v", "high",
 			"-level", "4.1",
 			"-g", strconv.Itoa(lowLatencyGOP),
 			"-keyint_min", strconv.Itoa(lowLatencyGOP),
@@ -1291,6 +1289,13 @@ func softwareScaleFilter(width, height int) string {
 }
 
 func audioMapArg(session *Session, request Request) string {
+	if request.AudioStreamIndex != 0 && session != nil {
+		for _, audio := range session.Media.AudioStreams {
+			if audio.Index == request.AudioStreamIndex {
+				return fmt.Sprintf("0:a:%d?", audio.Ordinal)
+			}
+		}
+	}
 	return "0:a:0?"
 }