Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include lpms min enc resolution #2466

Merged
merged 3 commits into from
Jun 21, 2022
Merged

Include lpms min enc resolution #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acd6415
Include lpms fix; use `ffmpeg.MediaFormatInfo` struct.
AlexKordic Jun 17, 2022
4205ebf
Update changelog
AlexKordic Jun 17, 2022
e6b0db5
CR: Changelog update
AlexKordic Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG_PENDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#### Transcoder

### Bug Fixes 🐞
- \#2466 bugfix: rendition resolution fix for portrait input videos; Min resolution applied for Nvidia hardware (@AlexKordic)

#### CLI
- \#2456 cli: Show O rather than B options when -redeemer flag set (@thomshutt)
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ require (
github.com/golang/mock v1.5.0
github.com/golang/protobuf v1.5.2
github.com/jaypipes/ghw v0.9.0
github.com/jaypipes/pcidb v1.0.0
github.com/livepeer/livepeer-data v0.4.11
github.com/livepeer/lpms v0.0.0-20220523122311-fc32eb80248c
github.com/livepeer/lpms v0.0.0-20220616165036-d82aa89e2477
github.com/livepeer/m3u8 v0.11.1
github.com/mattn/go-sqlite3 v1.11.0
github.com/olekukonko/tablewriter v0.0.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,8 @@ github.com/livepeer/joy4 v0.1.2-0.20191121080656-b2fea45cbded h1:ZQlvR5RB4nfT+cO
github.com/livepeer/joy4 v0.1.2-0.20191121080656-b2fea45cbded/go.mod h1:xkDdm+akniYxVT9KW1Y2Y7Hso6aW+rZObz3nrA9yTHw=
github.com/livepeer/livepeer-data v0.4.11 h1:Sv+ss8e4vcscnMWLxcRJ2g3sNIHyQ3RzCtgEelfGPzw=
github.com/livepeer/livepeer-data v0.4.11/go.mod h1:VIbJRdyH2Tas8EgLVkP79IPMepFDOv0dgHYLEZsCaf4=
github.com/livepeer/lpms v0.0.0-20220523122311-fc32eb80248c h1:LFwabjsjQU/bxVdULWNAWFnvoCdO9qzl5IYQXdCSDLI=
github.com/livepeer/lpms v0.0.0-20220523122311-fc32eb80248c/go.mod h1:Hr/JhxxPDipOVd4ZrGYWrdJfpVF8/SEI0nNr2ctAlkM=
github.com/livepeer/lpms v0.0.0-20220616165036-d82aa89e2477 h1:d1tBqdLsPRM/GTvujGeRFFHlidA8mBizsTl8ea9tQxc=
github.com/livepeer/lpms v0.0.0-20220616165036-d82aa89e2477/go.mod h1:Hr/JhxxPDipOVd4ZrGYWrdJfpVF8/SEI0nNr2ctAlkM=
github.com/livepeer/m3u8 v0.11.1 h1:VkUJzfNTyjy9mqsgp5JPvouwna8wGZMvd/gAfT5FinU=
github.com/livepeer/m3u8 v0.11.1/go.mod h1:IUqAtwWPAG2CblfQa4SVzTQoDcEMPyfNOaBSxqHMS04=
github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
Expand Down
12 changes: 6 additions & 6 deletions server/mediaserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var DetectionWhClient = &http.Client{Timeout: 2 * time.Second}
var SelectRandFreq float64

func PixelFormatNone() ffmpeg.PixelFormat {
return ffmpeg.PixelFormat{ffmpeg.PixelFormatNone}
return ffmpeg.PixelFormat{RawValue: ffmpeg.PixelFormatNone}
}

// For HTTP push watchdog
Expand Down Expand Up @@ -817,21 +817,21 @@ func (s *LivepeerServer) HandlePush(w http.ResponseWriter, r *http.Request) {
ctx = clog.AddNonce(ctx, cxn.nonce)
}

status, _, vcodecStr, pixelFormat, err := ffmpeg.GetCodecInfoBytes(body)
status, mediaFormat, err := ffmpeg.GetCodecInfoBytes(body)
isZeroFrame := status == ffmpeg.CodecStatusNeedsBypass
if err != nil {
errorOut(http.StatusUnprocessableEntity, "Error getting codec info url=%s", r.URL)
return
}

var vcodec *ffmpeg.VideoCodec
if len(vcodecStr) == 0 {
if len(mediaFormat.Vcodec) == 0 {
clog.Warningf(ctx, "Couldn't detect input video stream codec")
} else {
vcodecVal, ok := ffmpeg.FfmpegNameToVideoCodec[vcodecStr]
vcodecVal, ok := ffmpeg.FfmpegNameToVideoCodec[mediaFormat.Vcodec]
vcodec = &vcodecVal
if !ok {
errorOut(http.StatusUnprocessableEntity, "Unknown input stream codec=%s", vcodecStr)
errorOut(http.StatusUnprocessableEntity, "Unknown input stream codec=%s", mediaFormat.Vcodec)
return
}
}
Expand Down Expand Up @@ -875,7 +875,7 @@ func (s *LivepeerServer) HandlePush(w http.ResponseWriter, r *http.Request) {
}
}

cxn, err = s.registerConnection(ctx, st, vcodec, pixelFormat, segPar)
cxn, err = s.registerConnection(ctx, st, vcodec, mediaFormat.PixFormat, segPar)
if err != nil {
st.Close()
if err != errAlreadyExists {
Expand Down