diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index a840a67a..3d822d0b 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -92,13 +92,6 @@ def stream(video, target, profile, info): audioquality = 1 audiobitrate = None audiochannels = 1 - elif profile == '270p': - height = 270 - - audiorate = 44100 - audioquality = 0 - audiobitrate = None - audiochannels = 1 elif profile == '240p': height = 240 diff --git a/pandora/settings.py b/pandora/settings.py index 06be2e55..1b365325 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -138,7 +138,7 @@ INSTALLED_APPS = ( AUTH_PROFILE_MODULE = 'user.UserProfile' #Video encoding settings -#available profiles: 96p, 270p, 360p, 480p, 720p, 1080p +#available profiles: 96p, 240p, 360p, 480p, 720p, 1080p SITE_CONFIG = join(PROJECT_ROOT, '0xdb.json') DEFAULT_SORT = [{"key": "director", "operator": ""}] @@ -146,7 +146,14 @@ DEFAULT_THEME = "classic" VIDEO_PROFILE = '96p.webm' VIDEO_DERIVATIVES = [] -VIDEO_H264 = False + +#0xdb +''' +VIDEO_PROFILE = '96p.webm' +VIDEO_DERIVATIVES = [ + '96p.mp4' +] +''' #Pad.ma '''