heimoshuiyu/msw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
黑墨水鱼
2020-04-03 21:00:57 +08:00
parent 55c6163e18
commit dc75f82bf5
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.json
View File

@@ -1,7 +1,7 @@
{ {
"id": "miku", "id": "miku",
"listen_port": 3900, "listen_port": 3939,
"listen_ip": "127.0.0.1", "listen_ip": "0.0.0.0",
"listen_num": 39, "listen_num": 39,
"buffsize": 4096, "buffsize": 4096,
"proxy": false, "proxy": false,

7
plugins/ffmpeg.py
View File

@@ -58,7 +58,7 @@ class Ffmpeg_controller:
send_queue.put(ndp) send_queue.put(ndp)
cmd = 'ffmpeg -i ' + dp.head['filename'] + ' -c copy -f segment -segment_time 20 \ cmd = 'ffmpeg -i ' + dp.head['filename'] + ' -c copy -f segment -segment_time 20 \
-reset_timestamps 1 -y res/ffmpeg_tmp/' + '%d' + '.mp4' -reset_timestamps 1 -y res/ffmpeg_tmp/' + '%d' + '.mkv'
os.system(cmd) os.system(cmd)
@@ -72,7 +72,7 @@ class Ffmpeg_controller:
with open('res/ffmpeg_finished/filelist.txt', 'w') as f: with open('res/ffmpeg_finished/filelist.txt', 'w') as f:
for file in filelist: for file in filelist:
f.write('file \'%s\'\n' % file) f.write('file \'%s\'\n' % file)
object_filename = self.org_filename[:-4] + '.mkv' object_filename = self.org_filename[:-4] + '_conver.mkv'
subprocess.check_output('ffmpeg -f concat -i res/ffmpeg_finished/filelist.txt \ subprocess.check_output('ffmpeg -f concat -i res/ffmpeg_finished/filelist.txt \
-c copy -y ' + object_filename, shell=True) -c copy -y ' + object_filename, shell=True)
@@ -188,7 +188,7 @@ class Ffmpeg_controller:
dp = self.conver_task_queue.get() dp = self.conver_task_queue.get()
filename = dp.head['filename'] filename = dp.head['filename']
output_filename = filename[:-4] + '.mkv' output_filename = filename[:-4] + '_conver.mkv'
output_filename = output_filename.replace('ffmpeg_tmp', 'ffmpeg_finished') output_filename = output_filename.replace('ffmpeg_tmp', 'ffmpeg_finished')
os.system('ffmpeg -i ' + filename + ' -c:a libopus -ab 64k \ os.system('ffmpeg -i ' + filename + ' -c:a libopus -ab 64k \
-c:v libx265 -s 1280x720 -y ' + output_filename) -c:v libx265 -s 1280x720 -y ' + output_filename)
@@ -206,6 +206,7 @@ class Ffmpeg_controller:
def send_request(self): def send_request(self):
if self.status:
dp = Datapack(head={'from': __name__}) dp = Datapack(head={'from': __name__})
dp.method = 'get' dp.method = 'get'
dp.app = 'ffmpeg' dp.app = 'ffmpeg'

2
plugins/input.py
View File

@@ -38,7 +38,7 @@ def _main():
if raw_data == 'update': if raw_data == 'update':
raw_data = 'update:compress;update_to:*' raw_data = 'update:compress;update_to:*'
if raw_data == '1': if raw_data == '1':
raw_data = 'ffmpeg:start;filename:res/test.mp4' raw_data = 'ffmpeg:start;filename:test.mp4,concat:false'
if raw_data == '2': if raw_data == '2':
raw_data = 'ffmpeg:enable;to:*,server:miku' raw_data = 'ffmpeg:enable;to:*,server:miku'

6
plugins/net.py
View File

@@ -111,8 +111,8 @@ class Network_controller: # manage id and connection
if not os.path.exists('addrlist.txt'): if not os.path.exists('addrlist.txt'):
print('addrlist.txt not exists, config that base on addrlist_sample.txt') print('addrlist.txt not exists, config that base on addrlist_sample.txt')
else: else:
with open('addrlist.txt', 'r') as f: with open('addrlist.txt', 'rb') as f:
raw_data = f.read() raw_data = f.read().decode('utf-8')
raw_data = raw_data.replace('\r', '') raw_data = raw_data.replace('\r', '')
lines = raw_data.split('\n') lines = raw_data.split('\n')
for line in lines: for line in lines:
@@ -533,7 +533,7 @@ class Connection:
break break
if dp.delete: if dp.delete:
os.remove(dp.head['filename']) os.remove(dp.head['filename'])
print('Send file %s finished' % dp.head['filename'], dp) print('Send file %s to %s finished' % (dp.head['filename'], self.id), dp)
def i_did_something(self): def i_did_something(self):