Use the workbench for video processing.
Patch submitted by Kushal
This commit is contained in:
parent
316ede4705
commit
2ed6afb048
@ -14,7 +14,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from tempfile import NamedTemporaryFile
|
import os.path
|
||||||
import logging
|
import logging
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
@ -73,15 +73,14 @@ def process_video(proc_state):
|
|||||||
queued_filename = proc_state.get_queued_filename()
|
queued_filename = proc_state.get_queued_filename()
|
||||||
name_builder = FilenameBuilder(queued_filename)
|
name_builder = FilenameBuilder(queued_filename)
|
||||||
|
|
||||||
medium_filepath = create_pub_filepath(
|
medium_basename = name_builder.fill('{basename}-640p.webm')
|
||||||
entry, name_builder.fill('{basename}-640p.webm'))
|
medium_filepath = create_pub_filepath(entry, medium_basename)
|
||||||
|
|
||||||
thumbnail_filepath = create_pub_filepath(
|
thumbnail_basename = name_builder.fill('{basename}.thumbnail.jpg')
|
||||||
entry, name_builder.fill('{basename}.thumbnail.jpg'))
|
thumbnail_filepath = create_pub_filepath(entry, thumbnail_basename)
|
||||||
|
|
||||||
# Create a temporary file for the video destination (cleaned up with workbench)
|
# Create a temporary file for the video destination (cleaned up with workbench)
|
||||||
tmp_dst = NamedTemporaryFile(dir=workbench.dir, delete=False)
|
tmp_dst = os.path.join(workbench.dir, medium_basename)
|
||||||
with tmp_dst:
|
|
||||||
# Transcode queued file to a VP8/vorbis file that fits in a 640x640 square
|
# Transcode queued file to a VP8/vorbis file that fits in a 640x640 square
|
||||||
progress_callback = ProgressCallback(entry)
|
progress_callback = ProgressCallback(entry)
|
||||||
|
|
||||||
@ -108,7 +107,7 @@ def process_video(proc_state):
|
|||||||
else:
|
else:
|
||||||
transcoder = transcoders.VideoTranscoder()
|
transcoder = transcoders.VideoTranscoder()
|
||||||
|
|
||||||
transcoder.transcode(queued_filename, tmp_dst.name,
|
transcoder.transcode(queued_filename, tmp_dst,
|
||||||
vp8_quality=video_config['vp8_quality'],
|
vp8_quality=video_config['vp8_quality'],
|
||||||
vp8_threads=video_config['vp8_threads'],
|
vp8_threads=video_config['vp8_threads'],
|
||||||
vorbis_quality=video_config['vorbis_quality'],
|
vorbis_quality=video_config['vorbis_quality'],
|
||||||
@ -120,7 +119,7 @@ def process_video(proc_state):
|
|||||||
|
|
||||||
# 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, medium_filepath)
|
||||||
_log.debug('Saved medium')
|
_log.debug('Saved medium')
|
||||||
|
|
||||||
entry.media_files['webm_640'] = medium_filepath
|
entry.media_files['webm_640'] = medium_filepath
|
||||||
@ -133,18 +132,17 @@ def process_video(proc_state):
|
|||||||
height=dst_dimensions[1])
|
height=dst_dimensions[1])
|
||||||
|
|
||||||
# Temporary file for the video thumbnail (cleaned up with workbench)
|
# Temporary file for the video thumbnail (cleaned up with workbench)
|
||||||
tmp_thumb = NamedTemporaryFile(dir=workbench.dir, suffix='.jpg', delete=False)
|
tmp_thumb = os.path.join(workbench.dir, thumbnail_basename)
|
||||||
|
|
||||||
with tmp_thumb:
|
|
||||||
# Create a thumbnail.jpg that fits in a 180x180 square
|
# Create a thumbnail.jpg that fits in a 180x180 square
|
||||||
transcoders.VideoThumbnailerMarkII(
|
transcoders.VideoThumbnailerMarkII(
|
||||||
queued_filename,
|
queued_filename,
|
||||||
tmp_thumb.name,
|
tmp_thumb,
|
||||||
180)
|
180)
|
||||||
|
|
||||||
# Push the thumbnail to public storage
|
# Push the thumbnail to public storage
|
||||||
_log.debug('Saving thumbnail...')
|
_log.debug('Saving thumbnail...')
|
||||||
mgg.public_store.copy_local_to_storage(tmp_thumb.name, thumbnail_filepath)
|
mgg.public_store.copy_local_to_storage(tmp_thumb, thumbnail_filepath)
|
||||||
entry.media_files['thumb'] = thumbnail_filepath
|
entry.media_files['thumb'] = thumbnail_filepath
|
||||||
|
|
||||||
# save the original... but only if we did a transcoding
|
# save the original... but only if we did a transcoding
|
||||||
|
Loading…
x
Reference in New Issue
Block a user