scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 11:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

l3_video: corrected bps rates

Browse Source
This commit is contained in:
Jed Reynolds
2020-01-29 10:40:31 -08:00
parent 911b893e0c
commit 5f67b3dce4
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
l3_video_em.pl
View File

@@ -113,32 +113,32 @@ our %avail_stream_res = (
# https://support.google.com/youtube/answer/1722171?hl=en # https://support.google.com/youtube/answer/1722171?hl=en
# h.264 stream rates, SDR quality # h.264 stream rates, SDR quality
"yt-sdr-360p30" => [ 640, 360, 0, 128000, 1000000, 1800000, 30], "yt-sdr-360p30" => [ 640, 360, 0, 128000, 1000000, 1128000, 30],
"yt-sdr-480p30" => [ 852, 480, 0, 128000, 2500000, 1800000, 30], "yt-sdr-480p30" => [ 852, 480, 0, 128000, 2500000, 2628000, 30],
"yt-sdr-720p30" => [ 1280, 720, 0, 384000, 5000000, 1800000, 30], "yt-sdr-720p30" => [ 1280, 720, 0, 384000, 5000000, 5384000, 30],
"yt-sdr-1080p30" => [ 1920, 1080, 0, 384000, 8000000, 1800000, 30], "yt-sdr-1080p30" => [ 1920, 1080, 0, 384000, 8000000, 8384000, 30],
"yt-sdr-1440p30" => [ 2560, 1440, 0, 512000, 16000000, 1800000, 30], "yt-sdr-1440p30" => [ 2560, 1440, 0, 512000, 16000000, 16512000, 30],
"yt-sdr-2160p30" => [ 3840, 2160, 0, 512000, 40000000, 1800000, 30], "yt-sdr-2160p30" => [ 3840, 2160, 0, 512000, 40000000, 40512000, 30],
"yt-sdr-360p60" => [ 640, 360, 0, 128000, 1500000, 1800000, 60], "yt-sdr-360p60" => [ 640, 360, 0, 128000, 1500000, 1628000, 60],
"yt-sdr-480p60" => [ 852, 480, 0, 128000, 4000000, 1800000, 60], "yt-sdr-480p60" => [ 852, 480, 0, 128000, 4000000, 4128000, 60],
"yt-sdr-720p60" => [ 1280, 720, 0, 384000, 7500000, 1800000, 60], "yt-sdr-720p60" => [ 1280, 720, 0, 384000, 7500000, 7884000, 60],
"yt-sdr-1080p60" => [ 1920, 1080, 0, 384000, 12000000, 1800000, 60], "yt-sdr-1080p60" => [ 1920, 1080, 0, 384000, 12000000, 12384000, 60],
"yt-sdr-1440p60" => [ 2560, 1440, 0, 512000, 24000000, 1800000, 60], "yt-sdr-1440p60" => [ 2560, 1440, 0, 512000, 24000000, 24512000, 60],
"yt-sdr-2160p60" => [ 3840, 2160, 0, 512000, 61000000, 1800000, 60], "yt-sdr-2160p60" => [ 3840, 2160, 0, 512000, 61000000, 61512000, 60],
#"yt-hdr-360p60" => [ 1280, 720, 0, 32000, 1000000, 1800000, 60], # yt unsupported #"yt-hdr-360p60" => [ 1280, 720, 0, 32000, 1000000, 1800000, 60], # yt unsupported
#"yt-hdr-480p60" => [ 1280, 720, 0, 32000, 1000000, 1800000, 60], # yt unsupported #"yt-hdr-480p60" => [ 1280, 720, 0, 32000, 1000000, 1800000, 60], # yt unsupported
"yt-hdr-720p30" => [ 1280, 720, 0, 384000, 6500000, 1800000, 30], "yt-hdr-720p30" => [ 1280, 720, 0, 384000, 6500000, 6884000, 30],
"yt-hdr-1080p30" => [ 1920, 1080, 0, 384000, 10000000, 1800000, 30], "yt-hdr-1080p30" => [ 1920, 1080, 0, 384000, 10000000, 10384000, 30],
"yt-hdr-1440p30" => [ 2560, 1440, 0, 512000, 20000000, 1800000, 30], "yt-hdr-1440p30" => [ 2560, 1440, 0, 512000, 20000000, 20512000, 30],
"yt-hdr-2160p30" => [ 3840, 2160, 0, 512000, 50000000, 1800000, 30], "yt-hdr-2160p30" => [ 3840, 2160, 0, 512000, 50000000, 50512000, 30],
"yt-hdr-720p60" => [ 1280, 720, 0, 384000, 9500000, 1800000, 60], "yt-hdr-720p60" => [ 1280, 720, 0, 384000, 9500000, 9884000, 60],
"yt-hdr-1080p60" => [ 1920, 1080, 0, 384000, 15000000, 1800000, 60], "yt-hdr-1080p60" => [ 1920, 1080, 0, 384000, 15000000, 15384000, 60],
"yt-hdr-1440p60" => [ 2560, 1440, 0, 512000, 30000000, 1800000, 60], "yt-hdr-1440p60" => [ 2560, 1440, 0, 512000, 30000000, 30512000, 60],
"yt-hdr-2160p60" => [ 3840, 2160, 0, 512000, 75500000, 1800000, 60], "yt-hdr-2160p60" => [ 3840, 2160, 0, 512000, 75500000, 76012000, 60],
"raw720p30" => [ 1280, 720, 0, 64000, 221120000, 221184000, 30], "raw720p30" => [ 1280, 720, 0, 64000, 221120000, 221184000, 30],
@@ -214,9 +214,10 @@ if ($list_streams) {
my %sortedkeys = (); my %sortedkeys = ();
foreach my $oldkey (keys(%::avail_stream_res)) { foreach my $oldkey (keys(%::avail_stream_res)) {
my $ra_row = $::avail_stream_res{$oldkey}; my $ra_row = $::avail_stream_res{$oldkey};
my $x = 10000 + int(@$ra_row[$stream_keys{x}]); my $x = 10000000 + int(@$ra_row[$stream_keys{x}]);
my $y = 10000 + int(@$ra_row[$stream_keys{y}]); my $y = 10000000 + int(@$ra_row[$stream_keys{y}]);
my $newkey = "${x}_${y}_${oldkey}"; my $b = 10000000000 + int(@$ra_row[$stream_keys{video_bps}]);
my $newkey = "${b}_${x}_${y}_${oldkey}";
$sortedkeys{$newkey} = $oldkey; $sortedkeys{$newkey} = $oldkey;
} }
foreach my $sorted_key (sort(keys(%sortedkeys))) { foreach my $sorted_key (sort(keys(%sortedkeys))) {
@@ -232,7 +233,6 @@ if ($list_streams) {
print " Invalid BPS $bps, correct to $bps_sum"; print " Invalid BPS $bps, correct to $bps_sum";
} }
print "\n"; print "\n";
} }
exit 0; exit 0;
} }