Porting video to GStreamer 1.0

[mediagoblin.git] / mediagoblin / media_types / video / util.py

diff --git a/mediagoblin/media_types/video/util.py b/mediagoblin/media_types/video/util.py
index 5765ecfb1fe01c7752268a8fe5ab90920666d03c..4dc395b4755763a1c9b99b3e85bddfad2dc1959d 100644 (file)
--- a/mediagoblin/media_types/video/util.py
+++ b/mediagoblin/media_types/video/util.py
@@ -21,39 +21,45 @@ from mediagoblin import mg_globals as mgg
 _log = logging.getLogger(__name__)
 
 
-def skip_transcode(metadata):
+def skip_transcode(metadata, size):
     '''
     Checks video metadata against configuration values for skip_transcode.
 
     Returns True if the video matches the requirements in the configuration.
     '''
-    config = mgg.global_config['media_type:mediagoblin.media_types.video']\
+    config = mgg.global_config['plugins']['mediagoblin.media_types.video']\
             ['skip_transcode']
 
     medium_config = mgg.global_config['media:medium']
 
     _log.debug('skip_transcode config: {0}'.format(config))
-
-    if config['mime_types'] and metadata.get('mimetype'):
-        if not metadata['mimetype'] in config['mime_types']:
+    tags = metadata.get_tags()
+    if config['mime_types'] and tags.get_string('mimetype'):
+        if not tags.get_string('mimetype') in config['mime_types']:
             return False
 
-    if config['container_formats'] and metadata['tags'].get('audio-codec'):
-        if not metadata['tags']['container-format'] in config['container_formats']:
+    if config['container_formats'] and tags.get_string('container-format'):
+        if not (metadata.get_tags().get_string('container-format') in
+                config['container_formats']):
             return False
 
-    if config['video_codecs'] and metadata['tags'].get('audio-codec'):
-        if not metadata['tags']['video-codec'] in config['video_codecs']:
+    if (config['video_codecs'] and
+            metadata.get_tags().get_string('video-codec')):
+        if not (metadata.get_tags().get_string('video-codec') in
+                config['video_codecs']):
             return False
 
-    if config['audio_codecs'] and metadata['tags'].get('audio-codec'):
-        if not metadata['tags']['audio-codec'] in config['audio_codecs']:
+    if (config['audio_codecs'] and
+            metadata.get_tags().get_string('audio-codec')):
+        if not (metadata.get_tags().get_string('audio-codec') in
+                config['audio_codecs']):
             return False
 
+    video_info = metadata.get_video_streams()[0]
     if config['dimensions_match']:
-        if not metadata['videoheight'] <= medium_config['max_height']:
+        if not video_info.get_height() <= size[1]:
             return False
-        if not metadata['videowidth'] <= medium_config['max_width']:
+        if not video_info.get_width() <= size[0]:
             return False
 
     return True