diff --git a/src/webui/static/tv.js b/src/webui/static/tv.js index 6d9b2a62..ffce15a0 100644 --- a/src/webui/static/tv.js +++ b/src/webui/static/tv.js @@ -105,97 +105,114 @@ tv.ui = function() { tv.playback = function() { - //private space - var profiles = [ - { - name: 'pass', - muxer: 'pass', - audio: 'UNKNOWN', - video: 'UNKNOWN', - subs: 'UNKNOWN', - canPlay: 'video/MP2T' + + var profiles = { + pass: { + muxer: 'pass', + mimetype: 'video/MP2T' }, - { - name: 'webm', - muxer: 'webm', - audio: 'VORBIS', - video: 'VP8', - subs: 'NONE', - canPlay: 'video/webm; codecs="vp8.0, vorbis"' + hls: { + muxer: 'mpegts', + transcode: true, + audio: 'AAC', + video: 'H264', + subs: 'NONE', + playlist: true, + mimetype: 'application/x-mpegURL; codecs="avc1.42E01E, mp4a.40.2"' }, - { - name: 'hls', - muxer: 'mpegts', - audio: 'AAC', - video: 'H264', - subs: 'NONE', - canPlay: 'application/vnd.apple.mpegURL; codecs="avc1.42E01E, mp4a.40.2' + apple: { + muxer: 'mpegts', + transcode: true, + audio: 'AAC', + video: 'H264', + subs: 'NONE', + playlist: true, + mimetype: 'application/vnd.apple.mpegURL; codecs="avc1.42E01E, mp4a.40.2"' }, - { - name: 'hls', - muxer: 'mpegts', - audio: 'AAC', - video: 'H264', - subs: 'NONE', - canPlay: 'application/x-mpegURL; codecs="avc1.42E01E, mp4a.40.2' + ts: { + muxer: 'mpegts', + transcode: true, + audio: 'AAC', + video: 'H264', + subs: 'NONE', + playlist: false, + mimetype: 'video/MP2T; codecs="avc1.42E01E, mp4a.40.2"' }, - { - name: 'ts', - muxer: 'mpegts', - audio: 'AAC', - video: 'H264', - subs: 'NONE', - canPlay: 'video/MP2T; codecs="avc1.42E01E, mp4a.40.2' + mkv: { + muxer: 'matroska', + transcode: true, + audio: 'AAC', + video: 'H264', + subs: 'NONE', + playlist: false, + mimetype: 'video/x-matroska; codecs="avc1.42E01E, mp4a.40.2"' }, - { - name: 'mkv', - muxer: 'matroska', - audio: 'AAC', - video: 'H264', - subs: 'NONE', - canPlay: 'video/x-matroska; codecs="avc1.42E01E, mp4a.40.2' + webm: { + muxer: 'webm', + transcode: true, + audio: 'VORBIS', + video: 'VP8', + subs: 'NONE', + mimetype: 'video/webm; codecs="vp8.0, vorbis"' } - ]; + }; // public space return { getProfile: function() { var vid = document.createElement('video'); - for(var i=0; i