Release Kaleido 0.5.0 with source bitrate, audio selection and show shuffle
All checks were successful
Validate and publish Kaleido / android (push) Successful in 3m4s
All checks were successful
Validate and publish Kaleido / android (push) Successful in 3m4s
This commit is contained in:
parent
eeebc9af38
commit
dedf62a19e
19 changed files with 372 additions and 32 deletions
|
|
@ -34,6 +34,7 @@ def main():
|
|||
parser.add_argument('--expect-width',type=int)
|
||||
parser.add_argument('--expect-channels',type=int)
|
||||
parser.add_argument('--expect-audio-encoding',type=int)
|
||||
parser.add_argument('--fail-on-audio-underrun',action='store_true')
|
||||
args=parser.parse_args()
|
||||
folder=OUT/'playback-validation'/('onn' if DEVICE=='192.168.50.195:5555' else 'tcl')/args.label
|
||||
folder.mkdir(parents=True,exist_ok=True)
|
||||
|
|
@ -111,11 +112,13 @@ def main():
|
|||
'errors':[r['code'] for r in records if r['event']=='error'],'errorDetails':[r for r in records if r['event'] in ('error','prepareFailure')],'finalSample':last,'seek':seek_result,
|
||||
'expectsVideo':expects_video,'videoRendered':not expects_video or any(r.get('videoCounters',{}).get('rendered',0)>5 for r in samples),
|
||||
'closed':any(r['event']=='closed' for r in records),'before':watched(before),'after':watched(after),
|
||||
'audioUnderruns':[r for r in records if r['event']=='audioUnderrun'],
|
||||
'transport':'private-local-fixture' if args.fixture else 'Plex','progressUnchanged':None if args.fixture else watched(before)==watched(after)}
|
||||
(folder/'result.json').write_text(json.dumps(result,indent=2))
|
||||
print(json.dumps({k:result[k] for k in ('label','readySeconds','firstFrame','audioAdvancing','videoDecoders','errors','progressUnchanged')}),flush=True)
|
||||
print('Output:',last.get('video'),last.get('audio'),'mode:',last.get('mode'),'seek:',seek_result,flush=True)
|
||||
if ready is None:raise SystemExit('Playback did not become ready; see private evidence')
|
||||
if args.fail_on_audio_underrun and result['audioUnderruns']:raise SystemExit('Audio underrun detected; see private evidence')
|
||||
if not result['closed']:raise SystemExit('Player did not close cleanly')
|
||||
if result['progressUnchanged'] is False:raise SystemExit('Unexpected progress change; see before/after evidence')
|
||||
if args.seek and not seek_result['correct']:raise SystemExit('Seek did not reach the expected absolute position')
|
||||
|
|
|
|||
78
scripts/verify_playback_changes.py
Normal file
78
scripts/verify_playback_changes.py
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
"""Focused 0.5 checks: bitrate and actual audio switching, plus show-only Shuffle placement."""
|
||||
import argparse,json,time,urllib.parse,urllib.request
|
||||
from device import adb,OUT,screenshot
|
||||
from inspect_server import get,base,token
|
||||
from validate_playback import audit
|
||||
from verify_ui import key,focused,text,wait,labels,focus,snapshot,launch,passed
|
||||
|
||||
def wait_for(check,description,timeout=50):
|
||||
deadline=time.monotonic()+timeout
|
||||
while time.monotonic()<deadline:
|
||||
if check():return
|
||||
time.sleep(.25)
|
||||
raise AssertionError(description)
|
||||
|
||||
def audio():
|
||||
item=get('/library/metadata/870')['Metadata'][0]
|
||||
part=item['Media'][0]['Part'][0]
|
||||
streams=[s for s in part['Stream'] if s['streamType']==2]
|
||||
original=next((s for s in streams if s.get('selected')),streams[0])
|
||||
stereo=next(s for s in streams if s.get('channels')==2)
|
||||
preferences=adb('shell','run-as','tv.kaleido.app','cat','shared_prefs/preferences.xml')
|
||||
def restore_track():
|
||||
request=urllib.request.Request(base+'/library/parts/'+str(part['id'])+'?'+urllib.parse.urlencode({'audioStreamID':original['id'],'allParts':1}),method='PUT',headers={'X-Plex-Token':token})
|
||||
with urllib.request.urlopen(request,timeout=20) as r:assert r.status==200
|
||||
try:
|
||||
for mode in (0,2):
|
||||
restore_track()
|
||||
adb('shell','am','force-stop','tv.kaleido.app')
|
||||
adb('shell','run-as','tv.kaleido.app','rm','-f','files/playback-validation.jsonl')
|
||||
print('Checking audio mode',mode,flush=True)
|
||||
adb('shell','am','start','-n','tv.kaleido.app/.MainActivity','--es','testTitleId','870','--el','testOffset','90000','--ei','testMode',str(mode),'--ez','testValidation','true')
|
||||
wait_for(lambda:any(r['event']=='sample' and r.get('playing') and r.get('position',0)>90000 for r in audit()[1]),'Playback ready')
|
||||
key(127);focused('Play')
|
||||
wait_for(lambda:(lambda s:bool(s) and not s[-1]['playing'])([r for r in audit()[1] if r['event']=='sample']),'Playback paused')
|
||||
key(22,4);focused('Playback options');key(23);focused('Audio ·')
|
||||
if mode==0:
|
||||
key(20);focused('Quality ·');key(23);focused('Original quality · 19.1 Mbps')
|
||||
screenshot('050-original-bitrate');key(4);focused('Quality ·');key(19);focused('Audio ·')
|
||||
key(23);text('Audio tracks')
|
||||
screenshot('050-audio-tracks-'+str(mode))
|
||||
# The selected Plex default receives initial focus.
|
||||
delta=streams.index(stereo)-streams.index(original)
|
||||
key(20 if delta>=0 else 19,abs(delta));focused(stereo['displayTitle'])
|
||||
before=[r for r in audit()[1] if r['event']=='sample'][-1]['position']
|
||||
key(23);focused('Playback options')
|
||||
wait_for(lambda:any(r['event']=='selectedTracks' and any(a.get('channels')==2 for a in r.get('audio',[])) for r in audit()[1]),'Stereo track must actually be selected')
|
||||
wait_for(lambda:(lambda s:bool(s) and s[-1]['state']==3)([r for r in audit()[1] if r['event']=='sample']),'Track switch ready')
|
||||
samples=[r for r in audit()[1] if r['event']=='sample']
|
||||
assert not samples[-1]['playing'],'Paused state must survive track switch'
|
||||
assert abs(samples[-1]['position']-before)<2500,'Track switch must preserve position'
|
||||
key(126)
|
||||
wait_for(lambda:(lambda s:bool(s) and s[-1].get('audio',{}).get('channels')==2 and s[-1].get('playing'))([r for r in audit()[1] if r['event']=='sample']),'Selected stereo audio must play')
|
||||
raw,records=audit();(OUT/('050-track-switch-'+str(mode)+'.jsonl')).write_bytes(raw)
|
||||
assert not any(r['event']=='error' for r in records)
|
||||
passed('Actual stereo selection, position and pause preservation in '+('Original' if mode==0 else 'Plex conversion'))
|
||||
finally:
|
||||
adb('shell','am','force-stop','tv.kaleido.app');restore_track()
|
||||
adb('shell','run-as','tv.kaleido.app','sh','-c','"cat > shared_prefs/preferences.xml"',data=preferences)
|
||||
|
||||
def show():
|
||||
launch();key(22,3);focused('Search');key(23)
|
||||
focused('Movies, shows, episodes, people')
|
||||
adb('shell','input','text','silo');text('TV shows');key(66);focused('Silo');key(23);text('Seasons')
|
||||
root=text('Shuffle episodes');screenshot('050-show-shuffle')
|
||||
# Focus starts on the season rail. Reach its action row and explicitly focus Shuffle.
|
||||
if 'Season' in focus(root):key(19)
|
||||
wait(lambda r:any(x in focus(r) for x in ('Play','Resume','Watch next','Shuffle')),'Show actions')
|
||||
if 'Shuffle' not in focus(snapshot()):key(22)
|
||||
focused('Shuffle episodes')
|
||||
key(20);focused('Season 1');key(23)
|
||||
wait(lambda r:'Episodes' in labels(r) or any(x.startswith(('Play','Resume')) for x in labels(r)),'Season page')
|
||||
assert not any('Shuffle' in s for s in labels(snapshot())),'Shuffle must not appear on seasons'
|
||||
screenshot('050-season-without-shuffle')
|
||||
passed('Show Shuffle is remote-focusable and absent from season pages')
|
||||
|
||||
if __name__=='__main__':
|
||||
parser=argparse.ArgumentParser();parser.add_argument('check',choices=['audio','show']);args=parser.parse_args()
|
||||
(audio if args.check=='audio' else show)()
|
||||
|
|
@ -92,14 +92,14 @@ def player():
|
|||
passed('Compact player controls over actual video')
|
||||
key(19);focused('Playback timeline');key(22);capture('timeline');key(20);focused('Play')
|
||||
passed('D-pad Up focuses timeline, Right seeks, Down returns to play')
|
||||
key(22,2);focused('Audio tracks');key(23);text('Audio');capture('audio')
|
||||
key(22,2);focused('Audio tracks');key(23);text('Audio tracks');capture('audio')
|
||||
key(4);focused('Audio tracks');key(22);focused('Subtitles');key(23);text('Off');capture('subtitles')
|
||||
passed('Audio and subtitle panels open, close, and restore focus')
|
||||
key(4);focused('Subtitles');key(22);focused('Playback options');key(23);text('Playback options')
|
||||
key(20);focused('Speed');key(23);text('Playback speed');focused('Normal');key(20);focused('1.25×');key(23)
|
||||
key(20,2);focused('Speed');key(23);text('Playback speed');focused('Normal');key(20);focused('1.25×');key(23)
|
||||
focused('Playback options');key(23);text('Speed · 1.25×');key(4);focused('Playback options')
|
||||
key(23);text('Playback options');key(23);text('Playback quality');focused('Original quality');key(20);focused('4K');key(19);focused('Original quality');key(23)
|
||||
focused('Playback options');time.sleep(5);key(23);text('Quality · Original quality');key(4);focused('Playback options')
|
||||
key(23);text('Playback options');key(20);key(23);text('Playback quality');focused('Original quality');key(20);focused('4K');key(19);focused('Original quality');key(23)
|
||||
focused('Playback options');time.sleep(5);key(23);wait(lambda r:any(s.startswith('Quality · Original quality') for s in labels(r)),'Original bitrate quality label');key(4);focused('Playback options')
|
||||
passed('Player gear changes speed and switches a conversion to Original quality while retaining focus')
|
||||
key(4)
|
||||
wait(lambda r:focus(r)=='' and '2 Fast 2 Furious' not in labels(r),'Controls hidden by Back')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue