Generate always MP4 output for recordings (#192)

livepeer · May 5, 2023 · e2660f6 · e2660f6
1 parent 1c98ca4
commit e2660f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/golang/glog v1.1.1
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/livepeer/catalyst-api v0.0.13-0.20230412092340-584bd5df0143
-	github.com/livepeer/go-api-client v0.4.6
+	github.com/livepeer/go-api-client v0.4.7
 	github.com/livepeer/go-tools v0.2.11
 	github.com/livepeer/joy4 v0.1.2-0.20220210094601-95e4d28f5f07
 	github.com/livepeer/livepeer-data v0.6.5

diff --git a/go.sum b/go.sum
@@ -380,6 +380,10 @@ github.com/livepeer/catalyst-api v0.0.13-0.20230412092340-584bd5df0143 h1:x3qnBj
 github.com/livepeer/catalyst-api v0.0.13-0.20230412092340-584bd5df0143/go.mod h1:RXmOHwq1ZpQHf2KiVNP95g+kEAVYMMRgfSoKhYYd0so=
 github.com/livepeer/go-api-client v0.4.6 h1:Eo9mq5k9gnu8fgclbT7ibQdTgBV7a/NDIBIuYXHMzV0=
 github.com/livepeer/go-api-client v0.4.6/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw=
+github.com/livepeer/go-api-client v0.4.7-0.20230505075842-c7753b235c92 h1:7NtWLs2xmQV7/+D9kEuWofxdN9YQ8XwkrOAf3qEQ2HE=
+github.com/livepeer/go-api-client v0.4.7-0.20230505075842-c7753b235c92/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw=
+github.com/livepeer/go-api-client v0.4.7 h1:pJd0Ba7TtDJDUEOiPBx9KmLm+fIB8GRbAurd3lsZUVY=
+github.com/livepeer/go-api-client v0.4.7/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw=
 github.com/livepeer/go-tools v0.2.11 h1:LEW08kXsjswIn3YtZiCZydI2sZ3WI5FtleoD8pBwVSE=
 github.com/livepeer/go-tools v0.2.11/go.mod h1:/aZ+20XYLdeebFA3CrQTkHUf7DmiGBzh6Bs8JkbelUA=
 github.com/livepeer/joy4 v0.1.2-0.20220210094601-95e4d28f5f07 h1:ISkFQYYDgfnM6Go+VyemF66DKFc8kNoI9SwMv7GC9sM=

diff --git a/task/upload.go b/task/upload.go
@@ -553,7 +553,11 @@ func removeCredentials(metadata *clients.CatalystCallback) *clients.CatalystCall
 func uploadTaskOutputLocations(tctx *TaskContext) ([]OutputName, []clients.OutputLocation, error) {
 	playbackId := tctx.OutputAsset.PlaybackID
 	outURL := tctx.OutputOSObj.URL
-	outputNames, outputLocations, err := outputLocations(outURL, OUTPUT_ENABLED, playbackId, OUTPUT_ONLY_SHORT, playbackId)
+	var mp4 = OUTPUT_ONLY_SHORT
+	if tctx.OutputAsset.Source.Type == "recording" {
+		mp4 = OUTPUT_ENABLED
+	}
+	outputNames, outputLocations, err := outputLocations(outURL, OUTPUT_ENABLED, playbackId, mp4, playbackId)
 	if err != nil {
 		return nil, nil, err
 	}