heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If we're not transcoding, copy this file directly over to ['original']

Browse Source 
There's no reason to copy it over to 'webm_640' in such a case,
clearly.

Added logic so we don't do it twice either.

Haven't tested this yet though ;)

This commit sponsored by Algot Runeman.  Thank you!
This commit is contained in:
Christopher Allan Webber 2013-03-01 17:28:07 -06:00
parent ed6344009a
commit fd693e368b
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mediagoblin/media_types/video/processing.py
View File

@ -94,6 +94,12 @@ def process_video(proc_state):
open(tmp_dst.name, 'wb').write(open(queued_filename, 'rb').read()) open(tmp_dst.name, 'wb').write(open(queued_filename, 'rb').read())
dst_dimensions = metadata['videowidth'], metadata['videoheight'] dst_dimensions = metadata['videowidth'], metadata['videoheight']
# Push original file to public storage
_log.debug('Saving original...')
proc_state.copy_original(queued_filepath[-1])
did_transcode = False
else: else:
transcoder = transcoders.VideoTranscoder() transcoder = transcoders.VideoTranscoder()
@ -107,12 +113,14 @@ def process_video(proc_state):
dst_dimensions = transcoder.dst_data.videowidth,\ dst_dimensions = transcoder.dst_data.videowidth,\
transcoder.dst_data.videoheight transcoder.dst_data.videoheight
# Push transcoded video to public storage # Push transcoded video to public storage
_log.debug('Saving medium...') _log.debug('Saving medium...')
mgg.public_store.copy_local_to_storage(tmp_dst.name, medium_filepath) mgg.public_store.copy_local_to_storage(tmp_dst.name, medium_filepath)
_log.debug('Saved medium') _log.debug('Saved medium')
entry.media_files['webm_640'] = medium_filepath entry.media_files['webm_640'] = medium_filepath
did_transcode = True
# Save the width and height of the transcoded video # Save the width and height of the transcoded video
entry.media_data_init( entry.media_data_init(
@ -134,7 +142,10 @@ def process_video(proc_state):
mgg.public_store.copy_local_to_storage(tmp_thumb.name, thumbnail_filepath) mgg.public_store.copy_local_to_storage(tmp_thumb.name, thumbnail_filepath)
entry.media_files['thumb'] = thumbnail_filepath entry.media_files['thumb'] = thumbnail_filepath
if video_config['keep_original']: # save the original... but only if we did a transcoding
# (if we skipped transcoding and just kept the original anyway as the main
# media, then why would we save the original twice?)
if video_config['keep_original'] and did_transcode:
# Push original file to public storage # Push original file to public storage
_log.debug('Saving original...') _log.debug('Saving original...')
proc_state.copy_original(queued_filepath[-1]) proc_state.copy_original(queued_filepath[-1])