update codebase

Author: alexballas

httphandlers/httphandlers.go

@@ -278,7 +278,7 @@ func (s *HTTPserver) ServeMediaHandler() http.HandlerFunc {
 			if strings.HasSuffix(requestPathLower, ".m3u8") {
 				w.Header().Set("Content-Type", "application/vnd.apple.mpegurl")
 			} else if strings.HasSuffix(requestPathLower, ".ts") {
-				w.Header().Set("Content-Type", "video/mp2t")
+				w.Header().Set("Content-Type", "video/mpeg")
 			} else if strings.HasSuffix(requestPathLower, ".mp4") || strings.HasSuffix(requestPathLower, ".m4s") {
 				w.Header().Set("Content-Type", "video/mp4")
 			}
@@ -410,7 +410,7 @@ func (s *HTTPserver) AddHLSHandler(urlPrefix, dir string) {
 			w.Header().Set("Pragma", "no-cache")
 			w.Header().Set("Expires", "0")
 		} else if strings.HasSuffix(requestPathLower, ".ts") {
-			w.Header().Set("Content-Type", "video/MP2T")
+			w.Header().Set("Content-Type", "video/mpeg")
 			w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
 			w.Header().Set("Pragma", "no-cache")
 			w.Header().Set("Expires", "0")
@@ -458,7 +458,7 @@ func serveContent(w http.ResponseWriter, r *http.Request, tv *soapcalls.TVPayloa
 	if tv != nil {
 		isMedia = true
 		transcode = tv.Transcode
-		mediaType = tv.MediaType
+		mediaType = utils.DLNAResourceMediaType(tv.MediaType, transcode)
 		seek = tv.Seekable
 		tv.Log().Debug("", "Method", "DLNAMediaHTTP", "Action", "Request", "HTTP Method", r.Method, "Path", r.URL.Path,
 			"TimeSeekRange", r.Header.Get("TimeSeekRange.dlna.org"), "Range", r.Header.Get("Range"),
@@ -473,10 +473,9 @@ func serveContent(w http.ResponseWriter, r *http.Request, tv *soapcalls.TVPayloa
 		mediaType = "video/mp4" // Chromecast transcoding outputs fragmented MP4
 	}
 
-	w.Header()["transferMode.dlna.org"] = []string{"Interactive"}
+	w.Header()["transferMode.dlna.org"] = []string{utils.DLNATransferMode(mediaType)}
 
 	if isMedia {
-		w.Header()["transferMode.dlna.org"] = []string{"Streaming"}
 		w.Header()["realTimeInfo.dlna.org"] = []string{"DLNA.ORG_TLAG=*"}
 		w.Header()["Content-Type"] = []string{mediaType}
 	}
@@ -527,13 +526,7 @@ func serveContentBytes(w http.ResponseWriter, r *http.Request, mediaType string,
 	}
 
 	if r.Header.Get("getcontentFeatures.dlna.org") == "1" {
-		contentFeatures, err := utils.BuildContentFeatures(mediaType, "01", false)
-		if err != nil {
-			http.NotFound(w, r)
-			return
-		}
-
-		w.Header()["contentFeatures.dlna.org"] = []string{contentFeatures}
+		w.Header()["contentFeatures.dlna.org"] = []string{utils.BuildDLNAContentFeatures(utils.DLNAContentFeaturesOptions{ByteSeek: true})}
 	}
 
 	bReader := bytes.NewReader(f)
@@ -545,13 +538,7 @@ func serveContentReadClose(w http.ResponseWriter, r *http.Request, tv *soapcalls
 	defer f.Close()
 
 	if r.Header.Get("getcontentFeatures.dlna.org") == "1" {
-		contentFeatures, err := utils.BuildContentFeatures(mediaType, "00", transcode)
-		if err != nil {
-			http.NotFound(w, r)
-			return
-		}
-
-		w.Header()["contentFeatures.dlna.org"] = []string{contentFeatures}
+		w.Header()["contentFeatures.dlna.org"] = []string{utils.BuildDLNAContentFeatures(utils.DLNAContentFeaturesOptions{Converted: transcode})}
 	}
 	// In ffmpeg we can emulate seek support for live streams
 	if transcode && r.Method == http.MethodGet && strings.Contains(mediaType, "video") {
@@ -608,18 +595,7 @@ func serveContentSeekCloser(w http.ResponseWriter, r *http.Request, mediaType st
 	defer f.Close()
 
 	if r.Header.Get("getcontentFeatures.dlna.org") == "1" {
-		seekflag := "00"
-		if seek {
-			seekflag = "01"
-		}
-
-		contentFeatures, err := utils.BuildContentFeatures(mediaType, seekflag, false)
-		if err != nil {
-			http.NotFound(w, r)
-			return
-		}
-
-		w.Header()["contentFeatures.dlna.org"] = []string{contentFeatures}
+		w.Header()["contentFeatures.dlna.org"] = []string{utils.BuildDLNAContentFeatures(utils.DLNAContentFeaturesOptions{ByteSeek: seek})}
 	}
 
 	name := strings.TrimLeft(r.URL.Path, "/")
@@ -628,18 +604,10 @@ func serveContentSeekCloser(w http.ResponseWriter, r *http.Request, mediaType st
 
 func serveContentCustomType(w http.ResponseWriter, r *http.Request, tv *soapcalls.TVPayload, tcOpts *utils.TranscodeOptions, mediaType string, transcode, seek bool, f osFileType, ff *exec.Cmd) {
 	if r.Header.Get("getcontentFeatures.dlna.org") == "1" {
-		seekflag := "00"
-		if seek {
-			seekflag = "01"
-		}
-
-		contentFeatures, err := utils.BuildContentFeatures(mediaType, seekflag, transcode)
-		if err != nil {
-			http.NotFound(w, r)
-			return
-		}
-
-		w.Header()["contentFeatures.dlna.org"] = []string{contentFeatures}
+		w.Header()["contentFeatures.dlna.org"] = []string{utils.BuildDLNAContentFeatures(utils.DLNAContentFeaturesOptions{
+			ByteSeek:  seek && !transcode,
+			Converted: transcode,
+		})}
 	}
 	if transcode && r.Method == http.MethodGet && strings.Contains(mediaType, "video") {
 		// Since we're dealing with an io.Reader we can't

httphandlers/httphandlers_test.go

@@ -87,8 +87,8 @@ func TestServeContent(t *testing.T) {
 
 			for c := range strings.SplitSeq(cf[0], ";") {
 				if strings.Contains(c, "DLNA.ORG_OP") {
-					if tc.tvdata != nil && tc.tvdata.Transcode && c != "DLNA.ORG_OP=00" {
-						t.Fatalf("%s: no proper DLNA.ORG_OP header for transcoded video", tc.name)
+					if tc.tvdata != nil && tc.tvdata.Transcode {
+						t.Fatalf("%s: transcoded media must not advertise seek", tc.name)
 					}
 				}
 			}
@@ -133,21 +133,39 @@ func TestTranscodedDLNAHEADKeepsPlayableResourceContract(t *testing.T) {
 	if got := result.Header.Get("Content-Length"); got != strconv.Itoa(len(media)) {
 		t.Fatalf("content length = %q", got)
 	}
-	if got := result.Header.Get("Content-Type"); got != "video/mp4" {
+	if got := result.Header.Get("Content-Type"); got != "video/mpeg" {
 		t.Fatalf("content type = %q", got)
 	}
 	if got := result.Header.Get("Accept-Ranges"); got != "" {
 		t.Fatalf("accept ranges = %q", got)
 	}
 	features := result.Header["contentFeatures.dlna.org"] //nolint:staticcheck
-	if len(features) != 1 || !strings.Contains(features[0], "DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5") || !strings.Contains(features[0], "DLNA.ORG_OP=00") || !strings.Contains(features[0], "DLNA.ORG_CI=1") || !strings.Contains(features[0], "DLNA.ORG_FLAGS=01700000") {
+	if len(features) != 1 || features[0] != "DLNA.ORG_CI=1" {
 		t.Fatalf("content features = %q", features)
 	}
 	if strings.Contains(features[0], "DLNA.ORG_OP=10") {
 		t.Fatalf("unsupported live time seek advertised: %q", features)
 	}
 }
 
+func TestDLNAImageUsesInteractiveTransferMode(t *testing.T) {
+	tv := &soapcalls.TVPayload{MediaType: "image/jpeg", Seekable: true}
+	request := httptest.NewRequest(http.MethodGet, "/photo.jpg", nil)
+	request.Header.Set("getcontentFeatures.dlna.org", "1")
+	response := httptest.NewRecorder()
+
+	serveContent(response, request, tv, nil, []byte("jpeg"), new(exec.Cmd))
+	if got := response.Header().Get("Content-Type"); got != "image/jpeg" {
+		t.Fatalf("content type = %q", got)
+	}
+	if got := response.Header()["transferMode.dlna.org"]; len(got) != 1 || got[0] != "Interactive" { //nolint:staticcheck
+		t.Fatalf("transfer mode = %q, want Interactive", got)
+	}
+	if got := response.Header()["contentFeatures.dlna.org"]; len(got) != 1 || got[0] != "DLNA.ORG_OP=01;DLNA.ORG_CI=0" { //nolint:staticcheck
+		t.Fatalf("content features = %q", got)
+	}
+}
+
 func TestStaticHandlerMethodsMIMEAndCORS(t *testing.T) {
 	payload := []byte("normalized artwork")
 	srv := NewServer("127.0.0.1:0")
@@ -300,7 +318,7 @@ func (t *testReadSeekCloser) Close() error {
 // concurrent GET must be refused outright rather than served a body made of
 // whichever packets it managed to steal from the renderer already playing.
 func TestLiveStreamServesOneReaderAtATime(t *testing.T) {
-	tv := &soapcalls.TVPayload{MediaType: "video/mp2t"}
+	tv := &soapcalls.TVPayload{MediaType: "video/mpeg"}
 
 	var (
 		mu   sync.Mutex

internal/gui/dlna_screencast.go

@@ -11,18 +11,9 @@ import (
 	"go2tv.app/screencast/ts"
 )
 
-// dlnaScreencastMediaType is the DLNA media type used for the live MPEG-TS
-// stream. The first path segment ("video") matches the Sink protocol list
-// advertised by most renderers (see parseProtocolInfo, which compares only
-// that segment). The pipeline itself is the shared go2tv.app/screencast/ts
-// package, which muxes plain 188-byte TS packets, so this pairs with the _ISO
-// profile in dlnaprofiles rather than the 192-byte m2ts one.
-//
-// video/vnd.dlna.mpeg-tts, the type DLNA pairs with the m2ts profiles, is
-// deliberately not used: ffmpeg's m2ts mode declares the AAC track as PES
-// private data, which GStreamer-based renderers drop, leaving a silent
-// picture. See the screencast/ts package comment.
-const dlnaScreencastMediaType = "video/mp2t"
+// dlnaScreencastMediaType describes the plain 188-byte MPEG-TS stream emitted
+// by the screencast pipeline. DLNA uses video/mpeg for this wire format.
+const dlnaScreencastMediaType = "video/mpeg"
 
 // errScreencastStreamBusy is returned when the live stream is already being
 // served to a renderer.
@@ -31,11 +22,7 @@ var errScreencastStreamBusy = errors.New("screencast stream already has a reader
 // startDLNAScreencast starts the shared MPEG-TS pipeline. *ts.Session already
 // satisfies screencastSession, so it is handed to the caller as is.
 //
-// Audio is always captured. It is not a preference: we advertise the
-// AVC_TS_MP_HD_AAC_MULT5_ISO profile, which promises the renderer an AAC track,
-// so a video-only stream would make that promise false. Nothing is lost by
-// forcing it either, because the pipeline substitutes synthetic silence when
-// the machine has no audio source, so an AAC track exists either way.
+// Audio is always captured so the renderer receives a complete stream.
 func startDLNAScreencast(ffmpegPath string, logOutput io.Writer) (*ts.Session, error) {
 	return ts.Start(&ts.Options{
 		FFmpegPath:   ffmpegPath,

internal/mediaserver/server.go

@@ -418,25 +418,23 @@ func (s *Server) serveHTTP(w http.ResponseWriter, request *http.Request) {
 		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
 		return
 	}
-	if r.mediaType != "" {
-		w.Header().Set("Content-Type", r.mediaType)
-		w.Header().Set("transferMode.dlna.org", "Streaming")
+	wireMediaType := r.mediaType
+	if r.request.Target.Protocol != "Chromecast" {
+		wireMediaType = utils.DLNAResourceMediaType(r.mediaType, r.request.Transcode)
+	}
+	if wireMediaType != "" {
+		w.Header().Set("Content-Type", wireMediaType)
+		w.Header().Set("transferMode.dlna.org", utils.DLNATransferMode(wireMediaType))
 		w.Header().Set("realTimeInfo.dlna.org", "DLNA.ORG_TLAG=*")
 	}
 	if r.request.Target.Protocol == "Chromecast" {
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 	}
 	if request.Header.Get("getcontentFeatures.dlna.org") == "1" {
-		seek := "00"
-		if !r.request.Transcode && r.open != nil {
-			seek = "01"
-		}
-		contentFeatures, err := utils.BuildContentFeatures(r.mediaType, seek, r.request.Transcode)
-		if err != nil {
-			http.NotFound(w, request)
-			return
-		}
-		w.Header().Set("contentFeatures.dlna.org", contentFeatures)
+		w.Header().Set("contentFeatures.dlna.org", utils.BuildDLNAContentFeatures(utils.DLNAContentFeaturesOptions{
+			ByteSeek:  !r.request.Transcode && (r.open != nil || r.contents != nil),
+			Converted: r.request.Transcode,
+		}))
 	}
 	if r.artwork {
 		w.Header().Set("Cache-Control", "public, max-age=31536000, immutable")

internal/mediaserver/server_test.go

@@ -287,6 +287,31 @@ func TestGETHEADMethodRangeAndCallbackCoexist(t *testing.T) {
 	}
 }
 
+func TestImageRouteUsesInteractiveTransferMode(t *testing.T) {
+	server := New(Config{ListenAddr: "127.0.0.1:0"})
+	startTestServer(t, server, mediaRequest([]byte("media"), ".mp4", "video/mp4"))
+	route, err := server.Add(context.Background(), playback.RouteRequest{MediaType: "image/jpeg", Contents: []byte("jpeg")})
+	if err != nil {
+		t.Fatal(err)
+	}
+	request, _ := http.NewRequest(http.MethodGet, route.URL, nil)
+	request.Header.Set("getcontentFeatures.dlna.org", "1")
+	response, err := http.DefaultClient.Do(request)
+	if err != nil {
+		t.Fatal(err)
+	}
+	response.Body.Close()
+	if got := response.Header.Get("Content-Type"); got != "image/jpeg" {
+		t.Fatalf("content type = %q", got)
+	}
+	if got := response.Header.Get("transferMode.dlna.org"); got != "Interactive" {
+		t.Fatalf("transfer mode = %q, want Interactive", got)
+	}
+	if got := response.Header.Get("contentFeatures.dlna.org"); got != "DLNA.ORG_OP=01;DLNA.ORG_CI=0" {
+		t.Fatalf("content features = %q", got)
+	}
+}
+
 func TestTranscodedDLNAKeepsPlayableResourceContract(t *testing.T) {
 	requests := make(chan playback.ServerRequest, 1)
 	server := New(Config{
@@ -319,13 +344,13 @@ func TestTranscodedDLNAKeepsPlayableResourceContract(t *testing.T) {
 	if response.StatusCode != http.StatusOK {
 		t.Fatalf("HEAD status=%d", response.StatusCode)
 	}
-	if features := response.Header.Get("contentFeatures.dlna.org"); !strings.Contains(features, "DLNA.ORG_OP=00") || !strings.Contains(features, "DLNA.ORG_CI=1") {
+	if features := response.Header.Get("contentFeatures.dlna.org"); features != "DLNA.ORG_CI=1" {
 		t.Fatalf("content features = %q", features)
 	}
-	if got := response.Header.Get("Content-Type"); got != "video/x-matroska" {
+	if got := response.Header.Get("Content-Type"); got != "video/mpeg" {
 		t.Fatalf("content type = %q", got)
 	}
-	if features := response.Header.Get("contentFeatures.dlna.org"); !strings.Contains(features, "DLNA.ORG_PN=MATROSKA") || !strings.Contains(features, "DLNA.ORG_FLAGS=01700000") || strings.Contains(features, "DLNA.ORG_OP=10") {
+	if features := response.Header.Get("contentFeatures.dlna.org"); strings.Contains(features, "DLNA.ORG_OP") || strings.Contains(features, "DLNA.ORG_FLAGS") {
 		t.Fatalf("transcode profile = %q", features)
 	}
 	if got := response.Header.Get("TimeSeekRange.dlna.org"); got != "" {

internal/playbackadapter/adapters_test.go

@@ -424,7 +424,6 @@ func TestDLNAGaplessQueuesAndReadsNextURI(t *testing.T) {
 	}
 	if !strings.Contains(setNextBody, "<NextURI>http://127.0.0.1/next.mp3</NextURI>") ||
 		!strings.Contains(setNextBody, "Next track") ||
-		!strings.Contains(setNextBody, "DLNA.ORG_OP=00") ||
 		!strings.Contains(setNextBody, "DLNA.ORG_CI=1") ||
 		!strings.Contains(setNextBody, "duration=&#34;00:01:40&#34;") {
 		t.Fatalf("SetNextAVTransportURI body = %q", setNextBody)

soapcalls/soapbuilders.go

@@ -443,18 +443,14 @@ func setNextAVTransportSoapBuild(tvdata *TVPayload, clear bool) ([]byte, error)
 }
 
 func buildDIDLLite(tvdata *TVPayload, mediaURL string, mediaMetadata metadata.Media) ([]byte, error) {
-	seekflag := "00"
-	if tvdata.Seekable {
-		seekflag = "01"
-	}
-
-	contentFeatures, err := utils.BuildContentFeatures(tvdata.MediaType, seekflag, tvdata.Transcode)
-	if err != nil {
-		return nil, fmt.Errorf("build content features: %w", err)
-	}
+	wireMediaType := utils.DLNAResourceMediaType(tvdata.MediaType, tvdata.Transcode)
+	contentFeatures := utils.BuildDLNAContentFeatures(utils.DLNAContentFeaturesOptions{
+		ByteSeek:  tvdata.Seekable && !tvdata.Transcode,
+		Converted: tvdata.Transcode,
+	})
 
 	class := "object.item.videoItem.movie"
-	switch strings.Split(tvdata.MediaType, "/")[0] {
+	switch strings.Split(wireMediaType, "/")[0] {
 	case "audio":
 		class = "object.item.audioItem.musicTrack"
 	case "image":
@@ -472,7 +468,7 @@ func buildDIDLLite(tvdata *TVPayload, mediaURL string, mediaMetadata metadata.Me
 	}
 
 	resNodeData := []resNode{{
-		ProtocolInfo: fmt.Sprintf("http-get:*:%s:%s", tvdata.MediaType, contentFeatures),
+		ProtocolInfo: fmt.Sprintf("http-get:*:%s:%s", wireMediaType, contentFeatures),
 		Value:        mediaURL,
 	}}
 	if tvdata.MediaDuration > 0 {

soapcalls/soapbuilders_test.go

@@ -133,7 +133,7 @@ func TestBuildDIDLLiteTranscodedKeepsPlayableResourceContract(t *testing.T) {
 		t.Fatal(err)
 	}
 	metadata := string(got)
-	for _, want := range []string{"http-get:*:video/mp4:", "DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5", "DLNA.ORG_OP=00", "DLNA.ORG_CI=1", "DLNA.ORG_FLAGS=01700000", `duration="01:42:56"`, "http://host/movie.mp4"} {
+	for _, want := range []string{"http-get:*:video/mpeg:DLNA.ORG_CI=1", "DLNA.ORG_CI=1", `duration="01:42:56"`, "http://host/movie.mp4"} {
 		if !strings.Contains(metadata, want) {
 			t.Fatalf("DIDL missing %q: %s", want, metadata)
 		}