aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvijeth-aradhya <vijthaaa@gmail.com>2017-06-02 01:55:42 +0530
committervijeth-aradhya <vijthaaa@gmail.com>2017-06-02 01:55:42 +0530
commit2963b0a18231aac5d5fda3ae2ecc55a0b5c08823 (patch)
treef10a8a5a5ef699da61aa617ead038a5c347c427f
parentf7e1bfea7a5d53dc900c43ce84674d17d1c7d0e6 (diff)
downloadmediagoblin-2963b0a18231aac5d5fda3ae2ecc55a0b5c08823.tar.lz
mediagoblin-2963b0a18231aac5d5fda3ae2ecc55a0b5c08823.tar.xz
mediagoblin-2963b0a18231aac5d5fda3ae2ecc55a0b5c08823.zip
media_types/video/processing.py: Move store_metadata
Move store_metadata to self.common_setup() so that it's easy to parallelize self.transcode() later.
-rw-r--r--mediagoblin/media_types/video/processing.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index ca3087a2..e6b4a0b2 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -178,6 +178,14 @@ class CommonVideoProcessor(MediaProcessor):
self.transcoder = transcoders.VideoTranscoder()
self.did_transcode = False
+ # Extract metadata and keep a record of it
+ self.metadata = transcoders.discover(self.process_filename)
+
+ # metadata's stream info here is a DiscovererContainerInfo instance,
+ # it gets split into DiscovererAudioInfo and DiscovererVideoInfo;
+ # metadata itself has container-related data in tags, like video-codec
+ store_metadata(self.entry, self.metadata)
+
def copy_original(self):
# If we didn't transcode, then we need to keep the original
if not self.did_transcode or \
@@ -246,20 +254,12 @@ class CommonVideoProcessor(MediaProcessor):
if self._skip_processing('webm_video', **file_metadata):
return
- # Extract metadata and keep a record of it
- metadata = transcoders.discover(self.process_filename)
-
- # metadata's stream info here is a DiscovererContainerInfo instance,
- # it gets split into DiscovererAudioInfo and DiscovererVideoInfo;
- # metadata itself has container-related data in tags, like video-codec
- store_metadata(self.entry, metadata)
-
- orig_dst_dimensions = (metadata.get_video_streams()[0].get_width(),
- metadata.get_video_streams()[0].get_height())
+ orig_dst_dimensions = (self.metadata.get_video_streams()[0].get_width(),
+ self.metadata.get_video_streams()[0].get_height())
# Figure out whether or not we need to transcode this video or
# if we can skip it
- if skip_transcode(metadata, medium_size):
+ if skip_transcode(self.metadata, medium_size):
_log.debug('Skipping transcoding')
dst_dimensions = orig_dst_dimensions