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

doc: Fix syntax errors in example JSON #2346

Merged
merged 2 commits into from
Apr 6, 2022
Merged

doc: Fix syntax errors in example JSON #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8af0bdd
doc: Fix syntax errors in example JSON
thomshutt Mar 30, 2022
0604617
Update pending Changelog
thomshutt Mar 30, 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 @@ -23,6 +23,7 @@

#### General
- \#2299 Split devtool Orchestrator run scripts into versions with/without external transcoder and prevent Transcoder/Broadcaster run scripts from using same CLI port (@thomshutt)
- \#2346 Fix syntax errors in example JSON

#### Broadcaster
- \#2296 Increase orchestrator discovery timeout from `500ms` to `1` (@leszko)
Expand Down
10 changes: 5 additions & 5 deletions doc/transcodingoptions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,21 @@ An example of a full JSON configuration:
"bitrate": 5000000,
"fps": 30000,
"fpsDen": 1001,
"profile": H264High,
"gop": "2",
"profile": "H264High",
AlexKordic marked this conversation as resolved.
Show resolved Hide resolved
"gop": "2"
},{
"name": "webrtc-720p",
"width": 1280,
"height": 720,
"bitrate": 1500000,
"profile": H264ConstrainedHigh,
"profile": "H264ConstrainedHigh"
},{
"name":"highlight-reel",
"width":160,
"height":120,
"bitrate":100000,
"fps": "0.1",
"gop":"intra",
"fps": 1,
Copy link
Contributor

@cyberj0g cyberj0g Apr 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe original intention was to highlight that fractional FPS are supported? e.g. 24000/1001 and 30000/1001 are obsolete, but still quite common.

Copy link
Contributor Author

@thomshutt thomshutt Apr 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that could've been the original intent but looks like it's an int now

go-livepeer/net/lp_rpc.pb.go

Line 1043 in d655332

Fps uint32 `protobuf:"varint,20,opt,name=fps,proto3" json:"fps,omitempty"`

"gop":"intra"
}
]
```
Expand Down