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

Firefogg does not always include display_aspect_ratio

Browse source
This commit is contained in:
j 2014-04-09 18:06:49 +00:00
parent 614e7f0d09
commit 7dfa18c16a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
static/js/uploadVideoDialog.js
View file

@ -335,16 +335,22 @@ pandora.ui.uploadVideoDialog = function(data) {
options.audioBitrate = 22; options.audioBitrate = 22;
options.channels = 1; options.channels = 1;
} }
if (info.video && info.video[0].display_aspect_ratio) { if (info.video && info.video.length) {
info.video.forEach(function(video) {
if (!video.display_aspect_ratio) {
video.display_aspect_ratio = video.width + ':' + video.height;
video.pixel_aspect_ratio = '1:1';
}
});
dar = aspectratio(info.video[0].display_aspect_ratio); dar = aspectratio(info.video[0].display_aspect_ratio);
fps = aspectratio(info.video[0].framerate).float; fps = aspectratio(info.video[0].framerate).float;
options.width = parseInt(dar.float * options.height, 10); options.width = parseInt(dar.float * options.height, 10);
options.width += options.width % 2; options.width += options.width % 2;
// interlaced hdv material is detected with double framerates // interlaced hdv material is detected with double framerates
if (fps == 50) { if (fps == 50) {
options.framerate = 25; fps = options.framerate = 25;
} else if (fps == 60) { } else if (fps == 60) {
options.framerate = 30; fps = options.framerate = 30;
} }
if (Math.abs(options.width/options.height - dar.float) < 0.02) { if (Math.abs(options.width/options.height - dar.float) < 0.02) {
options.aspect = options.width + ':' + options.height; options.aspect = options.width + ':' + options.height;