From f2569da8c067d2926bbc32fa85b909172254e030 Mon Sep 17 00:00:00 2001 From: Max Holland Date: Tue, 24 Feb 2026 17:29:57 +0000 Subject: [PATCH 1/5] Pass through reencode flag Signed-off-by: Max Holland --- clients/catalyst.go | 1 + go.mod | 2 +- go.sum | 2 ++ task/upload.go | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/clients/catalyst.go b/clients/catalyst.go index 97e9fec..a067190 100644 --- a/clients/catalyst.go +++ b/clients/catalyst.go @@ -46,6 +46,7 @@ type UploadVODRequest struct { Encryption *EncryptionPayload `json:"encryption,omitempty"` ClipStrategy ClipStrategy `json:"clip_strategy,omitempty"` C2PA bool `json:"c2pa,omitempty"` + Reencode bool `json:"reencode_segmentation,omitempty"` } type EncryptionPayload struct { diff --git a/go.mod b/go.mod index a0b365d..ea9e7f0 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/golang/glog v1.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/livepeer/catalyst-api v0.1.2-0.20230925142340-c311569665b4 - github.com/livepeer/go-api-client v0.4.23-0.20240522195759-00d172d35bbb + github.com/livepeer/go-api-client v0.4.24-0.20260224172655-8553bc86db26 github.com/livepeer/go-tools v0.3.2 github.com/livepeer/livepeer-data v0.7.5-0.20230927031152-b938ac1dc665 github.com/peterbourgon/ff v1.7.1 diff --git a/go.sum b/go.sum index a74d3eb..0c7ac9b 100644 --- a/go.sum +++ b/go.sum @@ -285,6 +285,8 @@ github.com/livepeer/go-api-client v0.4.19-0.20240311145302-1abd53df256c h1:KPGkw github.com/livepeer/go-api-client v0.4.19-0.20240311145302-1abd53df256c/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw= github.com/livepeer/go-api-client v0.4.23-0.20240522195759-00d172d35bbb h1:ddTY+V26KtCyGgJZTd51gWbU1GvoDaGnD4ksNzZw14M= github.com/livepeer/go-api-client v0.4.23-0.20240522195759-00d172d35bbb/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw= +github.com/livepeer/go-api-client v0.4.24-0.20260224172655-8553bc86db26 h1:X90oDq7jngHQGEvCC2uGYGoBk3SFZ3cqYW1gK50p4j8= +github.com/livepeer/go-api-client v0.4.24-0.20260224172655-8553bc86db26/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw= github.com/livepeer/go-tools v0.3.2 h1:5pOUrOmkkGbbcWnpCt2yrSD6cD85G4GcpO4B25NpMJM= github.com/livepeer/go-tools v0.3.2/go.mod h1:qs31y68b3PQPmSr8nR8l5WQiIWI623z6pqOccqebjos= github.com/livepeer/livepeer-data v0.7.5-0.20230927031152-b938ac1dc665 h1:EXlI922Fsv9lyIw1LQ7pZN6slCuYya8NQrCFWN8INg4= diff --git a/task/upload.go b/task/upload.go index ad7815a..f08face 100644 --- a/task/upload.go +++ b/task/upload.go @@ -61,6 +61,7 @@ type handleUploadVODParams struct { catalystPipelineStrategy pipeline.Strategy clipStrategy clients.ClipStrategy c2pa bool + reencode bool } func handleUploadVOD(p handleUploadVODParams) (*TaskHandlerOutput, error) { @@ -104,6 +105,7 @@ func handleUploadVOD(p handleUploadVODParams) (*TaskHandlerOutput, error) { TargetSegmentSizeSecs: p.targetSegmentSizeSecs, Encryption: encryption, C2PA: p.c2pa, + Reencode: p.reencode, } if p.profiles != nil { @@ -261,6 +263,7 @@ func TaskTranscodeFile(tctx *TaskContext) (*TaskHandlerOutput, error) { targetSegmentSizeSecs: params.TargetSegmentSizeSecs, profiles: params.Profiles, c2pa: params.C2PA, + reencode: params.Reencode, }) } From 922080ced830b7f22a47342e26bcaceabf00bb61 Mon Sep 17 00:00:00 2001 From: Max Holland Date: Tue, 24 Feb 2026 18:08:37 +0000 Subject: [PATCH 2/5] fix Signed-off-by: Max Holland --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72705fa..106047c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-buster as builder +FROM golang:1.22-bookworm as builder WORKDIR /app @@ -15,7 +15,7 @@ COPY . . RUN make "version=$version" -FROM debian:buster-slim +FROM debian:bookworm-slim RUN apt update \ && apt install -yqq ca-certificates \ From 8ff229077b8070105fe7e2afc30ecdd6fc13a801 Mon Sep 17 00:00:00 2001 From: Max Holland Date: Wed, 25 Feb 2026 10:40:51 +0000 Subject: [PATCH 3/5] debug Signed-off-by: Max Holland --- task/runner.go | 1 + task/upload.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/task/runner.go b/task/runner.go index 8259470..ddf413c 100644 --- a/task/runner.go +++ b/task/runner.go @@ -372,6 +372,7 @@ func (r *runner) buildTaskContext(ctx context.Context, info data.TaskInfo) (*Tas if err != nil { return nil, err } + glog.Infof("Building task context for task %+v", task) inputAsset, inputOSObj, inputOS, err := r.getAssetAndOS(task.InputAssetID) if err != nil { return nil, err diff --git a/task/upload.go b/task/upload.go index f08face..6e14070 100644 --- a/task/upload.go +++ b/task/upload.go @@ -96,6 +96,8 @@ func handleUploadVOD(p handleUploadVODParams) (*TaskHandlerOutput, error) { } } + glog.Infof("handleUploadVOD params: %+v reencode: %t", p, tctx.Task.Params.TranscodeFile.Reencode) + req := clients.UploadVODRequest{ ExternalID: tctx.Task.ID, Url: inUrl, @@ -235,6 +237,7 @@ func isRecording(tctx *TaskContext) bool { func TaskTranscodeFile(tctx *TaskContext) (*TaskHandlerOutput, error) { params := *tctx.Task.Params.TranscodeFile + glog.Infof("TaskTranscodeFile params: %+v", params) return handleUploadVOD(handleUploadVODParams{ tctx: tctx, From 4995a3208bc1bd461e4c8764fe5facfa28a3e367 Mon Sep 17 00:00:00 2001 From: Max Holland Date: Wed, 25 Feb 2026 11:07:51 +0000 Subject: [PATCH 4/5] Revert "debug" This reverts commit 8ff229077b8070105fe7e2afc30ecdd6fc13a801. --- task/runner.go | 1 - task/upload.go | 3 --- 2 files changed, 4 deletions(-) diff --git a/task/runner.go b/task/runner.go index ddf413c..8259470 100644 --- a/task/runner.go +++ b/task/runner.go @@ -372,7 +372,6 @@ func (r *runner) buildTaskContext(ctx context.Context, info data.TaskInfo) (*Tas if err != nil { return nil, err } - glog.Infof("Building task context for task %+v", task) inputAsset, inputOSObj, inputOS, err := r.getAssetAndOS(task.InputAssetID) if err != nil { return nil, err diff --git a/task/upload.go b/task/upload.go index 6e14070..f08face 100644 --- a/task/upload.go +++ b/task/upload.go @@ -96,8 +96,6 @@ func handleUploadVOD(p handleUploadVODParams) (*TaskHandlerOutput, error) { } } - glog.Infof("handleUploadVOD params: %+v reencode: %t", p, tctx.Task.Params.TranscodeFile.Reencode) - req := clients.UploadVODRequest{ ExternalID: tctx.Task.ID, Url: inUrl, @@ -237,7 +235,6 @@ func isRecording(tctx *TaskContext) bool { func TaskTranscodeFile(tctx *TaskContext) (*TaskHandlerOutput, error) { params := *tctx.Task.Params.TranscodeFile - glog.Infof("TaskTranscodeFile params: %+v", params) return handleUploadVOD(handleUploadVODParams{ tctx: tctx, From 61031c2d5a415a2f4045cfaad4bf98e6f6425082 Mon Sep 17 00:00:00 2001 From: Max Holland Date: Wed, 25 Feb 2026 11:08:36 +0000 Subject: [PATCH 5/5] go mod tidy Signed-off-by: Max Holland --- go.sum | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.sum b/go.sum index 0c7ac9b..ce72872 100644 --- a/go.sum +++ b/go.sum @@ -281,10 +281,6 @@ github.com/libp2p/go-netroute v0.2.0 h1:0FpsbsvuSnAhXFnCY0VLFbJOzaK0VnP0r1QT/o4n github.com/libp2p/go-openssl v0.1.0 h1:LBkKEcUv6vtZIQLVTegAil8jbNpJErQ9AnT+bWV+Ooo= github.com/livepeer/catalyst-api v0.1.2-0.20230925142340-c311569665b4 h1:UfiMdEDGa88yqYD9+i1+ldAex9Kf1+3jbq+wBrmZccM= github.com/livepeer/catalyst-api v0.1.2-0.20230925142340-c311569665b4/go.mod h1:Ybiub5AGDrDfvyh1MWdIa551LAwhx/6lSpbQlgb1W1Q= -github.com/livepeer/go-api-client v0.4.19-0.20240311145302-1abd53df256c h1:KPGkwuKvAbHCADy3hssTCfJVh0wxYMlXVTehEikljCc= -github.com/livepeer/go-api-client v0.4.19-0.20240311145302-1abd53df256c/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw= -github.com/livepeer/go-api-client v0.4.23-0.20240522195759-00d172d35bbb h1:ddTY+V26KtCyGgJZTd51gWbU1GvoDaGnD4ksNzZw14M= -github.com/livepeer/go-api-client v0.4.23-0.20240522195759-00d172d35bbb/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw= github.com/livepeer/go-api-client v0.4.24-0.20260224172655-8553bc86db26 h1:X90oDq7jngHQGEvCC2uGYGoBk3SFZ3cqYW1gK50p4j8= github.com/livepeer/go-api-client v0.4.24-0.20260224172655-8553bc86db26/go.mod h1:Jdb+RI7JyzEZOHd1GUuKofwFDKMO/btTa80SdpUpYQw= github.com/livepeer/go-tools v0.3.2 h1:5pOUrOmkkGbbcWnpCt2yrSD6cD85G4GcpO4B25NpMJM=