0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

make derivatives more generic

Browse source
This commit is contained in:
j 2011-02-06 18:10:28 +05:30
commit 0feeef6d7d
7 changed files with 34 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
static/js/jquery/jquery.videosupport.js
View file

@ -10,6 +10,7 @@ jQuery.support.video = function() {
video.webm = false;
video.h264 = !!(v.canPlayType && v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
video.ogg = !!(v.canPlayType && v.canPlayType('video/ogg; codecs="theora, vorbis"').replace(/no/, ''));
video.ogv = video.ogg;
} else {
video.support = false;
}

12
static/js/pandora.js
View file

@ -1734,10 +1734,11 @@
});
} else if (app.user.ui.itemView == 'player') {
var video = result.data.item.stream,
subtitles = result.data.item.layers.subtitles;
subtitles = result.data.item.layers.subtitles,
format = Ox.supportedVideoFormat(video.formats);
video.height = video.profiles[0]
video.width = parseInt(video.height * video.aspectRatio / 2) * 2;
video.url = video.baseUrl + '/' + video.height + 'p.' + ($.support.video.webm ? 'webm' : 'mp4');
video.url = video.baseUrl + '/' + video.height + 'p.' + format;
app.$ui.contentPanel.replace(1, app.$ui.player = new Ox.VideoPanelPlayer({
annotationsSize: app.user.ui.annotationsSize,
duration: video.duration,
@ -1775,10 +1776,11 @@
'in': 5,
'out': 10,
'value': 'This subtitle is just a test...'
}];
video.height = video.profiles[0]
}],
format = Ox.supportedVideoFormat(video.formats);
video.height = video.profiles[0];
video.width = parseInt(video.height * video.aspectRatio / 2) * 2;
video.url = video.baseUrl + '/' + video.height + 'p.' + ($.support.video.webm ? 'webm' : 'mp4');
video.url = video.baseUrl + '/' + video.height + 'p.' + format;
app.$ui.contentPanel.replace(1, app.$ui.editor = new Ox.VideoEditor({
annotationsSize: app.user.ui.annotationsSize,
cuts: cuts,