-
Notifications
You must be signed in to change notification settings - Fork 736
High bitrate/samplerate is now correctly clipped #1318
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.
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
Open
0x5066
wants to merge
7
commits into
captbaritone:master
Choose a base branch
from
0x5066:newkbpskhzdisplay
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
aef33c1
High bitrate/samplerate is now correctly clipped
0x5066 c19d3ef
Moved globals to be local to their designated functions
0x5066 e3260b2
Use padStart and slice to more properly format the data
0x5066 26be9e5
Display "0" while gathering bitrate and khz
0x5066 de83c99
Remove logging of kbps in console
0x5066 1602642
Assign ``finalKhz`` properly
0x5066 60e4b00
Make CI hopefully happy
0x5066 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,35 @@ | |
| [id: string]: PlaylistTrack; | ||
| } | ||
|
|
||
| function massageKhz(khz: number) { | ||
| let finalKhz: String; | ||
| const khzNum: number = Math.round(khz / 1000); | ||
|
|
||
| // there is no real need to run a condition for below 100khz | ||
| // when the other conditions (hopefully) take over | ||
| // ...also to make CI happy | ||
| finalKhz = String(khzNum); | ||
| if (khzNum <= 10) finalKhz = String(khzNum).slice(0, 1).padStart(2, " "); | ||
| if (khzNum >= 100) finalKhz = String(khzNum).slice(1, 3); | ||
| return finalKhz; | ||
0x5066 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| function massageKbps(kbps: number) { | ||
| let finalKbps: String; | ||
| const bitrateNum: number = Math.round(kbps / 1000); | ||
|
|
||
| finalKbps = String(bitrateNum); // present as is | ||
| if (bitrateNum <= 100) finalKbps = String(bitrateNum).padStart(3, " "); | ||
| if (bitrateNum <= 10) finalKbps = String(bitrateNum).padStart(3, " "); | ||
| // from Justin Frankel directly: | ||
| // IIRC H was for "hundred" and "C" was thousand, | ||
| // though why it was for thousand I have no idea lol, maybe it was a mistake... | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fantastic comment |
||
| if (bitrateNum >= 1000) finalKbps = String(bitrateNum).slice(0, 2) + "H"; | ||
| if (bitrateNum >= 10000) | ||
| finalKbps = String(bitrateNum).slice(0, 1).padStart(2, " ") + "C"; | ||
| return finalKbps; | ||
| } | ||
|
|
||
| const defaultPlaylistState: TracksState = {}; | ||
|
|
||
| const tracks = ( | ||
|
|
@@ -80,8 +109,8 @@ | |
| artist, | ||
| album, | ||
| albumArtUrl, | ||
| kbps: bitrate != null ? String(Math.round(bitrate / 1000)) : kbps, | ||
| khz: sampleRate != null ? String(Math.round(sampleRate / 1000)) : khz, | ||
| kbps: bitrate != null ? massageKbps(bitrate) : kbps, | ||
| khz: sampleRate != null ? massageKhz(sampleRate) : khz, | ||
| channels: numberOfChannels != null ? numberOfChannels : channels, | ||
| }, | ||
| }; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.