l3_video: corrected bps rates

This commit is contained in:
Jed Reynolds
2020-01-29 10:45:28 -08:00
parent 5f67b3dce4
commit 8bb54bf4b2

View File

@@ -73,72 +73,72 @@ our %stream_keys = (
our %avail_stream_res = (
# nicname w, h, interlaced, audio, vid bps, tt bps framerate
"sqvga-4:3" => [ 160, 120, 0, 16000, 32000, 48000, 30],
"sqvga-16:9" => [ 160, 90, 0, 16000, 32000, 48000, 30],
"qvga-4:3" => [ 320, 240, 0, 16000, 32000, 48000, 30],
"qvga-16:9" => [ 320, 180, 0, 16000, 32000, 48000, 30],
"qcif-48k-4:3" => [ 144, 108, 0, 16000, 32000, 48000, 30],
"qcif-48k-16:9" => [ 192, 108, 0, 16000, 32000, 48000, 30],
"qcif-96k-4:3" => [ 192, 144, 0, 16000, 80000, 96000, 30],
"qcif-96k-16:9" => [ 256, 144, 0, 16000, 80000, 96000, 30],
"cif" => [ 352, 288, 0, 32000, 268000, 300000, 30],
"cif-300k-4:3" => [ 288, 216, 0, 32000, 268000, 300000, 30],
"cif-300k-16:9" => [ 384, 216, 0, 32000, 268000, 300000, 30],
"cif-500k-4:3" => [ 320, 240, 0, 32000, 468000, 500000, 30],
"cif-500k-16:9" => [ 384, 216, 0, 32000, 468000, 500000, 30],
"d1-800k-4:3" => [ 640, 480, 0, 32000, 768000, 800000, 30],
"d1-800k-16:9" => [ 852, 480, 0, 32000, 768000, 800000, 30],
"d1-1200k-4:3" => [ 640, 480, 0, 32000, 1168000, 1200000, 30],
"d1-1200k-16:9" => [ 852, 480, 0, 32000, 1168000, 1200000, 30],
"hd-1800k-16:9" => [ 1280, 720, 0, 64000, 1736000, 1800000, 59.94],
"hd-2400k-16:9" => [ 1280, 720, 0, 64000, 2272000, 2336000, 59.94],
"sqvga-4:3" => [ 160, 120, 0, 16000, 32000, 48000, 30],
"sqvga-16:9" => [ 160, 90, 0, 16000, 32000, 48000, 30],
"qvga-4:3" => [ 320, 240, 0, 16000, 32000, 48000, 30],
"qvga-16:9" => [ 320, 180, 0, 16000, 32000, 48000, 30],
"qcif-48k-4:3" => [ 144, 108, 0, 16000, 32000, 48000, 30],
"qcif-48k-16:9" => [ 192, 108, 0, 16000, 32000, 48000, 30],
"qcif-96k-4:3" => [ 192, 144, 0, 16000, 80000, 96000, 30],
"qcif-96k-16:9" => [ 256, 144, 0, 16000, 80000, 96000, 30],
"cif" => [ 352, 288, 0, 32000, 268000, 300000, 30],
"cif-300k-4:3" => [ 288, 216, 0, 32000, 268000, 300000, 30],
"cif-300k-16:9" => [ 384, 216, 0, 32000, 268000, 300000, 30],
"cif-500k-4:3" => [ 320, 240, 0, 32000, 468000, 500000, 30],
"cif-500k-16:9" => [ 384, 216, 0, 32000, 468000, 500000, 30],
"d1-800k-4:3" => [ 640, 480, 0, 32000, 768000, 800000, 30],
"d1-800k-16:9" => [ 852, 480, 0, 32000, 768000, 800000, 30],
"d1-1200k-4:3" => [ 640, 480, 0, 32000, 1168000, 1200000, 30],
"d1-1200k-16:9" => [ 852, 480, 0, 32000, 1168000, 1200000, 30],
"hd-1800k-16:9" => [ 1280, 720, 0, 64000, 1736000, 1800000, 59.94],
"hd-2400k-16:9" => [ 1280, 720, 0, 64000, 2272000, 2336000, 59.94],
"108p4:3" => [ 144, 108, 0, 16000, 32000, 48000, 30],
"144p16:9" => [ 192, 144, 0, 16000, 80000, 96000, 30],
"216p4:3" => [ 288, 216, 0, 32000, 268000, 300000, 30],
"216p16:9" => [ 384, 216, 0, 32000, 268000, 300000, 30],
"240p4:3" => [ 320, 240, 0, 32000, 468000, 500000, 30],
"108p4:3" => [ 144, 108, 0, 16000, 32000, 48000, 30],
"144p16:9" => [ 192, 144, 0, 16000, 80000, 96000, 30],
"216p4:3" => [ 288, 216, 0, 32000, 268000, 300000, 30],
"216p16:9" => [ 384, 216, 0, 32000, 268000, 300000, 30],
"240p4:3" => [ 320, 240, 0, 32000, 468000, 500000, 30],
"360p4:3" => [ 480, 360, 0, 32000, 768000, 800000, 30],
"480i4:3" => [ 640, 480, 1, 32000, 768000, 800000, 30],
"480p4:3" => [ 640, 480, 0, 32000, 768000, 800000, 30],
"480p16:9" => [ 852, 480, 0, 32000, 1168000, 1200000, 30],
"360p4:3" => [ 480, 360, 0, 32000, 768000, 800000, 30],
"480i4:3" => [ 640, 480, 1, 32000, 768000, 800000, 30],
"480p4:3" => [ 640, 480, 0, 32000, 768000, 800000, 30],
"480p16:9" => [ 852, 480, 0, 32000, 1168000, 1200000, 30],
# unadopted standard
#"720i" => [ 1280, 720, 1, 64000, 1736000, 1800000, 30],
# 0.92 megapixels, 2.76MB per frame
"720p" => [ 1280, 720, 0, 64000, 1736000, 1800000, 59.94],
"720p" => [ 1280, 720, 0, 64000, 1736000, 1800000, 59.94],
# https://support.google.com/youtube/answer/1722171?hl=en
# h.264 stream rates, SDR quality
"yt-sdr-360p30" => [ 640, 360, 0, 128000, 1000000, 1128000, 30],
"yt-sdr-480p30" => [ 852, 480, 0, 128000, 2500000, 2628000, 30],
"yt-sdr-720p30" => [ 1280, 720, 0, 384000, 5000000, 5384000, 30],
"yt-sdr-1080p30" => [ 1920, 1080, 0, 384000, 8000000, 8384000, 30],
"yt-sdr-1440p30" => [ 2560, 1440, 0, 512000, 16000000, 16512000, 30],
"yt-sdr-2160p30" => [ 3840, 2160, 0, 512000, 40000000, 40512000, 30],
"yt-sdr-360p30" => [ 640, 360, 0, 128000, 1000000, 1128000, 30],
"yt-sdr-480p30" => [ 852, 480, 0, 128000, 2500000, 2628000, 30],
"yt-sdr-720p30" => [ 1280, 720, 0, 384000, 5000000, 5384000, 30],
"yt-sdr-1080p30" => [ 1920, 1080, 0, 384000, 8000000, 8384000, 30],
"yt-sdr-1440p30" => [ 2560, 1440, 0, 512000, 16000000, 16512000, 30],
"yt-sdr-2160p30" => [ 3840, 2160, 0, 512000, 40000000, 40512000, 30],
"yt-sdr-360p60" => [ 640, 360, 0, 128000, 1500000, 1628000, 60],
"yt-sdr-480p60" => [ 852, 480, 0, 128000, 4000000, 4128000, 60],
"yt-sdr-720p60" => [ 1280, 720, 0, 384000, 7500000, 7884000, 60],
"yt-sdr-1080p60" => [ 1920, 1080, 0, 384000, 12000000, 12384000, 60],
"yt-sdr-1440p60" => [ 2560, 1440, 0, 512000, 24000000, 24512000, 60],
"yt-sdr-2160p60" => [ 3840, 2160, 0, 512000, 61000000, 61512000, 60],
"yt-sdr-360p60" => [ 640, 360, 0, 128000, 1500000, 1628000, 60],
"yt-sdr-480p60" => [ 852, 480, 0, 128000, 4000000, 4128000, 60],
"yt-sdr-720p60" => [ 1280, 720, 0, 384000, 7500000, 7884000, 60],
"yt-sdr-1080p60" => [ 1920, 1080, 0, 384000, 12000000, 12384000, 60],
"yt-sdr-1440p60" => [ 2560, 1440, 0, 512000, 24000000, 24512000, 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-480p60" => [ 1280, 720, 0, 32000, 1000000, 1800000, 60], # yt unsupported
"yt-hdr-720p30" => [ 1280, 720, 0, 384000, 6500000, 6884000, 30],
"yt-hdr-1080p30" => [ 1920, 1080, 0, 384000, 10000000, 10384000, 30],
"yt-hdr-1440p30" => [ 2560, 1440, 0, 512000, 20000000, 20512000, 30],
"yt-hdr-2160p30" => [ 3840, 2160, 0, 512000, 50000000, 50512000, 30],
"yt-hdr-720p30" => [ 1280, 720, 0, 384000, 6500000, 6884000, 30],
"yt-hdr-1080p30" => [ 1920, 1080, 0, 384000, 10000000, 10384000, 30],
"yt-hdr-1440p30" => [ 2560, 1440, 0, 512000, 20000000, 20512000, 30],
"yt-hdr-2160p30" => [ 3840, 2160, 0, 512000, 50000000, 50512000, 30],
"yt-hdr-720p60" => [ 1280, 720, 0, 384000, 9500000, 9884000, 60],
"yt-hdr-1080p60" => [ 1920, 1080, 0, 384000, 15000000, 15384000, 60],
"yt-hdr-1440p60" => [ 2560, 1440, 0, 512000, 30000000, 30512000, 60],
"yt-hdr-2160p60" => [ 3840, 2160, 0, 512000, 75500000, 76012000, 60],
"yt-hdr-720p60" => [ 1280, 720, 0, 384000, 9500000, 9884000, 60],
"yt-hdr-1080p60" => [ 1920, 1080, 0, 384000, 15000000, 15384000, 60],
"yt-hdr-1440p60" => [ 2560, 1440, 0, 512000, 30000000, 30512000, 60],
"yt-hdr-2160p60" => [ 3840, 2160, 0, 512000, 75500000, 76012000, 60],
"raw720p30" => [ 1280, 720, 0, 64000, 221120000, 221184000, 30],
@@ -146,12 +146,12 @@ our %avail_stream_res = (
# frame size 6.2MB
# 1080i60 1920x1080 186MBps
"raw1080i" => [ 1920, 540, 1, 128000, 1486384000, 1486512000, 59.94],
"raw1080i30" => [ 1920, 540, 1, 128000, 1487872000, 1488000000, 30],
"raw1080i60" => [ 1920, 540, 1, 128000, 1487872000, 1488000000, 60],
"raw1080i" => [ 1920, 540, 1, 128000, 1486384000, 1486512000, 59.94],
"raw1080i30" => [ 1920, 540, 1, 128000, 1487872000, 1488000000, 30],
"raw1080i60" => [ 1920, 540, 1, 128000, 1487872000, 1488000000, 60],
# 1080p60 1920x1080 373MBps, 6.2Mbps frame size
"raw1080p" => [ 1920, 1080, 0, 128000, 2975872000, 2976000000, 60],
"raw1080p" => [ 1920, 1080, 0, 128000, 2975872000, 2976000000, 60],
);