From 14fa74bf44413bcfe4f5ffefa40fe8cfdb9e9d2f Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 19 Apr 2012 18:14:43 +0200 Subject: [PATCH] add resolutions to firefogg upload --- pandora/archive/extract.py | 5 ++--- pandora/padma.jsonc | 2 ++ static/js/pandora/uploadDialog.js | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index 49cb5a72..444f8ff9 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -82,16 +82,15 @@ def stream(video, target, profile, info): height = 480 audiorate = 44100 - audioquality = 2 + audioquality = 3 audiobitrate = None audiochannels = 2 elif profile == '432p': height = 432 audiorate = 44100 - audioquality = 2 + audioquality = 3 audiobitrate = None audiochannels = 2 - elif profile == '360p': height = 360 diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index a7fa4bc3..a70649d0 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -685,6 +685,8 @@ "download": true, "formats": ["webm", "mp4"], "previewRatio": 1.3333333333, + //supported resolutions are + //1080, 720, 480, 432, 360, 288, 240, 144, 96 "resolutions": [480, 240, 96] } } diff --git a/static/js/pandora/uploadDialog.js b/static/js/pandora/uploadDialog.js index ff11b47c..d4cbdffe 100644 --- a/static/js/pandora/uploadDialog.js +++ b/static/js/pandora/uploadDialog.js @@ -226,16 +226,32 @@ pandora.ui.uploadDialog = function(data) { options.samplerate = 44100; options.audioQuality = 3; options.channels = 2; + } else if (resolution == 432) { + options.height = 432; + options.samplerate = 44100; + options.audioQuality = 3; + options.channels = 2; } else if (resolution == 360) { options.height = 320; options.samplerate = 44100; options.audioQuality = 1; options.channels = 1; + } else if (resolution == 288) { + options.height = 288; + options.samplerate = 44100; + options.audioQuality = 0; + options.channels = 1; } else if (resolution == 240) { options.height = 240; options.samplerate = 44100; options.audioQuality = 0; options.channels = 1; + } else if (resolution == 144) { + options.height = 144; + options.samplerate = 22050; + options.audioQuality = -1; + options.audioBitrate = 22; + options.channels = 1; } else if (resolution == 96) { options.height = 96; options.samplerate = 22050;