ScuffleTV / scuffle

Live streaming platform
https://scuffle.tv
224 stars 25 forks source link

[VIDEO] HLS Groups #95

Closed TroyKomodo closed 1 year ago

TroyKomodo commented 1 year ago

Proposed changes

This is not part of the HLS spec but it provides extra information for our player so we can prioritize OPUS > AAC when we have both available. (if the player supports opus decode)

#EXTM3U
#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="d44abf6c-6297-4546-a4ad-495ccff1d806",NAME="d44abf6c-6297-4546-a4ad-495ccff1d806",AUTOSELECT=YES,DEFAULT=YES,URI="d44abf6c-6297-4546-a4ad-495ccff1d806/index.m3u8"
#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="a49654ce-6ece-4507-9963-66d0832353d1",NAME="a49654ce-6ece-4507-9963-66d0832353d1",AUTOSELECT=YES,DEFAULT=YES,URI="a49654ce-6ece-4507-9963-66d0832353d1/index.m3u8"
#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="317caf86-21fc-4ed9-929a-4d0cd673af66",NAME="317caf86-21fc-4ed9-929a-4d0cd673af66",AUTOSELECT=YES,DEFAULT=YES,URI="317caf86-21fc-4ed9-929a-4d0cd673af66/index.m3u8"
#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="bfd5330d-9e87-4012-a074-070da9fbd000",NAME="bfd5330d-9e87-4012-a074-070da9fbd000",AUTOSELECT=YES,DEFAULT=YES,URI="bfd5330d-9e87-4012-a074-070da9fbd000/index.m3u8"
#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="547c5292-1ae7-42fc-b903-e8ed36ac56de",NAME="547c5292-1ae7-42fc-b903-e8ed36ac56de",AUTOSELECT=YES,DEFAULT=YES,URI="547c5292-1ae7-42fc-b903-e8ed36ac56de/index.m3u8"
#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="692f3447-00ba-428e-ad38-326ae9db0b62",NAME="692f3447-00ba-428e-ad38-326ae9db0b62",AUTOSELECT=YES,DEFAULT=YES,URI="692f3447-00ba-428e-ad38-326ae9db0b62/index.m3u8"
#EXT-X-STREAM-INF:GROUP="opus",NAME="audio-only",BANDWIDTH=98304,CODECS="opus",AUDIO="d44abf6c-6297-4546-a4ad-495ccff1d806"
d44abf6c-6297-4546-a4ad-495ccff1d806/index.m3u8
#EXT-X-STREAM-INF:GROUP="aac",NAME="audio-only",BANDWIDTH=131072,CODECS="mp4a.40.2",AUDIO="a49654ce-6ece-4507-9963-66d0832353d1"
a49654ce-6ece-4507-9963-66d0832353d1/index.m3u8
#EXT-X-STREAM-INF:GROUP="opus",NAME="source",BANDWIDTH=8290304,CODECS="av01.0.13M.08.0.110.01.01.01.0,opus",RESOLUTION=3840x2160,FRAME-RATE=60,VIDEO="317caf86-21fc-4ed9-929a-4d0cd673af66",AUDIO="d44abf6c-6297-4546-a4ad-495ccff1d806"
317caf86-21fc-4ed9-929a-4d0cd673af66/index.m3u8
#EXT-X-STREAM-INF:GROUP="aac",NAME="source",BANDWIDTH=8323072,CODECS="av01.0.13M.08.0.110.01.01.01.0,mp4a.40.2",RESOLUTION=3840x2160,FRAME-RATE=60,VIDEO="317caf86-21fc-4ed9-929a-4d0cd673af66",AUDIO="a49654ce-6ece-4507-9963-66d0832353d1"
317caf86-21fc-4ed9-929a-4d0cd673af66/index.m3u8
#EXT-X-STREAM-INF:GROUP="opus",NAME="720p",BANDWIDTH=4194304,CODECS="avc1.640033,opus",RESOLUTION=1280x720,FRAME-RATE=60,VIDEO="bfd5330d-9e87-4012-a074-070da9fbd000",AUDIO="d44abf6c-6297-4546-a4ad-495ccff1d806"
bfd5330d-9e87-4012-a074-070da9fbd000/index.m3u8
#EXT-X-STREAM-INF:GROUP="aac",NAME="720p",BANDWIDTH=4227072,CODECS="avc1.640033,mp4a.40.2",RESOLUTION=1280x720,FRAME-RATE=60,VIDEO="bfd5330d-9e87-4012-a074-070da9fbd000",AUDIO="a49654ce-6ece-4507-9963-66d0832353d1"
bfd5330d-9e87-4012-a074-070da9fbd000/index.m3u8
#EXT-X-STREAM-INF:GROUP="opus",NAME="480p",BANDWIDTH=2146304,CODECS="avc1.640033,opus",RESOLUTION=853x480,FRAME-RATE=30,VIDEO="547c5292-1ae7-42fc-b903-e8ed36ac56de",AUDIO="d44abf6c-6297-4546-a4ad-495ccff1d806"
547c5292-1ae7-42fc-b903-e8ed36ac56de/index.m3u8
#EXT-X-STREAM-INF:GROUP="aac",NAME="480p",BANDWIDTH=2179072,CODECS="avc1.640033,mp4a.40.2",RESOLUTION=853x480,FRAME-RATE=30,VIDEO="547c5292-1ae7-42fc-b903-e8ed36ac56de",AUDIO="a49654ce-6ece-4507-9963-66d0832353d1"
547c5292-1ae7-42fc-b903-e8ed36ac56de/index.m3u8
#EXT-X-STREAM-INF:GROUP="opus",NAME="360p",BANDWIDTH=1122304,CODECS="avc1.640033,opus",RESOLUTION=640x360,FRAME-RATE=30,VIDEO="692f3447-00ba-428e-ad38-326ae9db0b62",AUDIO="d44abf6c-6297-4546-a4ad-495ccff1d806"
692f3447-00ba-428e-ad38-326ae9db0b62/index.m3u8
#EXT-X-STREAM-INF:GROUP="aac",NAME="360p",BANDWIDTH=1155072,CODECS="avc1.640033,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=30,VIDEO="692f3447-00ba-428e-ad38-326ae9db0b62",AUDIO="a49654ce-6ece-4507-9963-66d0832353d1"
692f3447-00ba-428e-ad38-326ae9db0b62/index.m3u8
#EXT-X-SCUF-GROUP:GROUP="opus",PRIORITY=1
#EXT-X-SCUF-GROUP:GROUP="aac",PRIORITY=2

Notice the last 2 lines, this allows our player to pick the appropriate version based on a priority specified here.

Types of changes

What types of changes does your code introduce to Scuffle? Put an x in the boxes that apply

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

codecov[bot] commented 1 year ago

Codecov Report

Merging #95 (82cacaa) into main (192e363) will increase coverage by 0.05%. The diff coverage is 92.59%.

@@            Coverage Diff             @@
##             main      #95      +/-   ##
==========================================
+ Coverage   73.88%   73.94%   +0.05%     
==========================================
  Files         209      209              
  Lines       15196    15228      +32     
==========================================
+ Hits        11228    11260      +32     
  Misses       3968     3968              
Impacted Files Coverage Δ
backend/api/src/database/stream.rs 47.61% <35.71%> (ø)
backend/api/src/grpc/api.rs 80.96% <94.44%> (ø)
video/ingest/src/ingest/connection.rs 68.20% <100.00%> (+0.37%) :arrow_up:
video/ingest/src/ingest/variants.rs 99.41% <100.00%> (+0.07%) :arrow_up:
video/transcoder/src/transcoder/job/mod.rs 76.12% <100.00%> (+0.59%) :arrow_up:

... and 6 files with indirect coverage changes