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

Compare commits

base: 0x2620:3df8380099765df9a65d13c554684b73ee9fdac4
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:7fd0daf8d32578d2d3ac75cb1c61f9b2bb8af1c1
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "3df8380099765df9a65d13c554684b73ee9fdac4" and "7fd0daf8d32578d2d3ac75cb1c61f9b2bb8af1c1" have entirely different histories.
3df8380099 ... 7fd0daf8d3

3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pandora/archive/extract.py
View file

@ -216,7 +216,6 @@ def stream(video, target, profile, info, audio_track=0, flags={}):
'-vb', '%dk' % bitrate, '-vb', '%dk' % bitrate,
'-aspect', aspect, '-aspect', aspect,
# '-vf', 'yadif', # '-vf', 'yadif',
'-max_muxing_queue_size', '512',
'-vf', 'hqdn3d%s,scale=%s:%s' % (crop, width, height), '-vf', 'hqdn3d%s,scale=%s:%s' % (crop, width, height),
'-g', '%d' % int(fps*5), '-g', '%d' % int(fps*5),
] ]

4
pandora/config.indiancinema.jsonc
View file

@ -1695,7 +1695,7 @@
"annotationsCalendarSize": 128, "annotationsCalendarSize": 128,
"annotationsHighlight": "none", "annotationsHighlight": "none",
"annotationsMapSize": 128, "annotationsMapSize": 128,
"annotationsRange": "selection", "annotationsRange": "position",
"annotationsSize": 256, "annotationsSize": 256,
"annotationsSort": "position", "annotationsSort": "position",
"calendarFind": "", "calendarFind": "",
@ -1852,7 +1852,7 @@
"videoSize": "small", "videoSize": "small",
"videoSubtitles": true, "videoSubtitles": true,
"videoSubtitlesOffset": 0, "videoSubtitlesOffset": 0,
"videoTimeline": "keyframes", "videoTimeline": "slitscan",
"videoView": "player", "videoView": "player",
"videoVolume": 1 "videoVolume": 1
}, },

2
pandora/document/views.py
View file

@ -210,7 +210,7 @@ def parse_query(data, user):
for key in ('keys', 'group', 'file', 'range', 'position', 'positions', 'sort'): for key in ('keys', 'group', 'file', 'range', 'position', 'positions', 'sort'):
if key in data: if key in data:
query[key] = data[key] query[key] = data[key]
#print(query.get('sort'), data.get('sort')) print(query.get('sort'), data.get('sort'))
query['qs'] = models.Document.objects.find(data, user) query['qs'] = models.Document.objects.find(data, user)
query['item'] = get_item(data.get('query', {})) query['item'] = get_item(data.get('query', {}))
return query return query