# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1449243221 -3600
# Node ID 54505b8bad88bec43564c9e2b101fbf360422724
# Parent  3713530021449d164d14dbff585e4cf243ce3f93
Added conversion options

diff -r 371353002144 -r 54505b8bad88 src/pyams_media/interfaces/__init__.py
--- a/src/pyams_media/interfaces/__init__.py	Thu Oct 08 12:30:44 2015 +0200
+++ b/src/pyams_media/interfaces/__init__.py	Fri Dec 04 16:33:41 2015 +0100
@@ -76,6 +76,11 @@
 # Media conversions adapter interfaces
 #
 
+MEDIA_CONVERSIONS_KEY = 'pyams_media.media.conversions'
+
+MEDIA_CONVERSION_CMDLINE_KEY = 'pyams_media.media.conversion.cmdline'
+
+
 class IMediaConversions(Interface):
     """Media conversions interface"""
 
@@ -169,6 +174,7 @@
                             required=False,
                             vocabulary="PyAMS ZEO connections")
 
+    # Video conversions attributes
     video_formats = List(title=_("Video formats conversions"),
                          description=_("Published video files will be automatically converted to this format"),
                          value_type=Choice(vocabulary="PyAMS media video converters"),
@@ -179,6 +185,15 @@
                             required=True,
                             value_type=Choice(vocabulary=VIDEO_FRAME_SIZE_VOCABULARY))
 
+    video_bitrate = Int(title=_("Video bitrate"),
+                        description=_("In kilo-bytes per second. Leave empty to keep original value"),
+                        required=False)
+
+    video_quantisation = Int(title=_("Video quantisation scale"),
+                             description=_("Lower value indicates higher quality"),
+                             required=False,
+                             default=1)
+
     video_audio_sampling = Int(title=_("Video audio frequency"),
                                description=_("A common value is 22050. Leave empty to keep original value."),
                                required=False)
@@ -187,11 +202,7 @@
                               description=_("In kilo-bytes per second. Leave empty to keep original value."),
                               required=False)
 
-    video_quantisation = Int(title=_("Video quantisation scale"),
-                             description=_("Lower value indicates higher quality"),
-                             required=False,
-                             default=1)
-
+    # Audio conversions attributes
     audio_formats = List(title=_("Audio formats conversions"),
                          description=_("Published audio files will be automatically converted to this format"),
                          value_type=Choice(vocabulary="PyAMS media audio converters"),
diff -r 371353002144 -r 54505b8bad88 src/pyams_media/utility.py
--- a/src/pyams_media/utility.py	Thu Oct 08 12:30:44 2015 +0200
+++ b/src/pyams_media/utility.py	Fri Dec 04 16:33:41 2015 +0100
@@ -39,9 +39,10 @@
 
     video_formats = FieldProperty(IMediaConversionUtility['video_formats'])
     video_frame_size = FieldProperty(IMediaConversionUtility['video_frame_size'])
+    video_bitrate = FieldProperty(IMediaConversionUtility['video_bitrate'])
+    video_quantisation = FieldProperty(IMediaConversionUtility['video_quantisation'])
     video_audio_sampling = FieldProperty(IMediaConversionUtility['video_audio_sampling'])
     video_audio_bitrate = FieldProperty(IMediaConversionUtility['video_audio_bitrate'])
-    video_quantisation = FieldProperty(IMediaConversionUtility['video_quantisation'])
 
     audio_formats = FieldProperty(IMediaConversionUtility['audio_formats'])
     audio_sampling = FieldProperty(IMediaConversionUtility['audio_sampling'])