Move FFmpeg and QuickTime settings to own structure inside RenderSettings

rather than making all properties have ffmpeg_ and quicktime_ prefixes

9 files changed, 107 insertions, 103 deletions

diff --git a/release/scripts/presets/ffmpeg/DV.py b/release/scripts/presets/ffmpeg/DV.py
index 241d6938a5f..a95d861111a 100644
--- a/release/scripts/presets/ffmpeg/DV.py
+++ b/release/scripts/presets/ffmpeg/DV.py
@@ -1,7 +1,7 @@
 import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
-bpy.context.scene.render.ffmpeg_format = "DV"
+bpy.context.scene.render.ffmpeg.format = "DV"
 bpy.context.scene.render.resolution_x = 720
 
 if is_ntsc:
@@ -9,6 +9,6 @@ if is_ntsc:
 else:
     bpy.context.scene.render.resolution_y = 576
 
-bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
-bpy.context.scene.render.ffmpeg_audio_codec = "PCM"
-bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"
+bpy.context.scene.render.ffmpeg.audio_mixrate = 48000
+bpy.context.scene.render.ffmpeg.audio_codec = "PCM"
+bpy.context.scene.render.ffmpeg.audio_channels = "STEREO"
diff --git a/release/scripts/presets/ffmpeg/DVD.py b/release/scripts/presets/ffmpeg/DVD.py
index 07828a755cd..d858bd70836 100644
--- a/release/scripts/presets/ffmpeg/DVD.py
+++ b/release/scripts/presets/ffmpeg/DVD.py
@@ -1,24 +1,24 @@
 import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
-bpy.context.scene.render.ffmpeg_format = "MPEG2"
+bpy.context.scene.render.ffmpeg.format = "MPEG2"
 bpy.context.scene.render.resolution_x = 720
 
 if is_ntsc:
     bpy.context.scene.render.resolution_y = 480
-    bpy.context.scene.render.ffmpeg_gopsize = 18
+    bpy.context.scene.render.ffmpeg.gopsize = 18
 else:
     bpy.context.scene.render.resolution_y = 576
-    bpy.context.scene.render.ffmpeg_gopsize = 15
+    bpy.context.scene.render.ffmpeg.gopsize = 15
 
-bpy.context.scene.render.ffmpeg_video_bitrate = 6000
-bpy.context.scene.render.ffmpeg_maxrate = 9000
-bpy.context.scene.render.ffmpeg_minrate = 0
-bpy.context.scene.render.ffmpeg_buffersize = 224 * 8
-bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg.video_bitrate = 6000
+bpy.context.scene.render.ffmpeg.maxrate = 9000
+bpy.context.scene.render.ffmpeg.minrate = 0
+bpy.context.scene.render.ffmpeg.buffersize = 224 * 8
+bpy.context.scene.render.ffmpeg.packetsize = 2048
+bpy.context.scene.render.ffmpeg.muxrate = 10080000
 
-bpy.context.scene.render.ffmpeg_audio_codec = "AC3"
-bpy.context.scene.render.ffmpeg_audio_bitrate = 448
-bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
-bpy.context.scene.render.ffmpeg_audio_channels = "SURROUND51"
+bpy.context.scene.render.ffmpeg.audio_codec = "AC3"
+bpy.context.scene.render.ffmpeg.audio_bitrate = 448
+bpy.context.scene.render.ffmpeg.audio_mixrate = 48000
+bpy.context.scene.render.ffmpeg.audio_channels = "SURROUND51"
diff --git a/release/scripts/presets/ffmpeg/SVCD.py b/release/scripts/presets/ffmpeg/SVCD.py
index 584f192c3d8..deaf9697045 100644
--- a/release/scripts/presets/ffmpeg/SVCD.py
+++ b/release/scripts/presets/ffmpeg/SVCD.py
@@ -1,24 +1,24 @@
 import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
-bpy.context.scene.render.ffmpeg_format = "MPEG2"
+bpy.context.scene.render.ffmpeg.format = "MPEG2"
 bpy.context.scene.render.resolution_x = 480
 
 if is_ntsc:
     bpy.context.scene.render.resolution_y = 480
-    bpy.context.scene.render.ffmpeg_gopsize = 18
+    bpy.context.scene.render.ffmpeg.gopsize = 18
 else:
     bpy.context.scene.render.resolution_y = 576
-    bpy.context.scene.render.ffmpeg_gopsize = 15
+    bpy.context.scene.render.ffmpeg.gopsize = 15
 
-bpy.context.scene.render.ffmpeg_video_bitrate = 2040
-bpy.context.scene.render.ffmpeg_maxrate = 2516
-bpy.context.scene.render.ffmpeg_minrate = 0
-bpy.context.scene.render.ffmpeg_buffersize = 224 * 8
-bpy.context.scene.render.ffmpeg_packetsize = 2324
-bpy.context.scene.render.ffmpeg_muxrate = 0
+bpy.context.scene.render.ffmpeg.video_bitrate = 2040
+bpy.context.scene.render.ffmpeg.maxrate = 2516
+bpy.context.scene.render.ffmpeg.minrate = 0
+bpy.context.scene.render.ffmpeg.buffersize = 224 * 8
+bpy.context.scene.render.ffmpeg.packetsize = 2324
+bpy.context.scene.render.ffmpeg.muxrate = 0
 
-bpy.context.scene.render.ffmpeg_audio_bitrate = 224
-bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
-bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"
+bpy.context.scene.render.ffmpeg.audio_bitrate = 224
+bpy.context.scene.render.ffmpeg.audio_mixrate = 44100
+bpy.context.scene.render.ffmpeg.audio_codec = "MP2"
+bpy.context.scene.render.ffmpeg.audio_channels = "STEREO"
diff --git a/release/scripts/presets/ffmpeg/VCD.py b/release/scripts/presets/ffmpeg/VCD.py
index 35dda07a064..3e57be720fb 100644
--- a/release/scripts/presets/ffmpeg/VCD.py
+++ b/release/scripts/presets/ffmpeg/VCD.py
@@ -1,24 +1,24 @@
 import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
-bpy.context.scene.render.ffmpeg_format = "MPEG1"
+bpy.context.scene.render.ffmpeg.format = "MPEG1"
 bpy.context.scene.render.resolution_x = 352
 
 if is_ntsc:
     bpy.context.scene.render.resolution_y = 240
-    bpy.context.scene.render.ffmpeg_gopsize = 18
+    bpy.context.scene.render.ffmpeg.gopsize = 18
 else:
     bpy.context.scene.render.resolution_y = 288
-    bpy.context.scene.render.ffmpeg_gopsize = 15
+    bpy.context.scene.render.ffmpeg.gopsize = 15
 
-bpy.context.scene.render.ffmpeg_video_bitrate = 1150
-bpy.context.scene.render.ffmpeg_maxrate = 1150
-bpy.context.scene.render.ffmpeg_minrate = 1150
-bpy.context.scene.render.ffmpeg_buffersize = 40 * 8
-bpy.context.scene.render.ffmpeg_packetsize = 2324
-bpy.context.scene.render.ffmpeg_muxrate = 2352 * 75 * 8
+bpy.context.scene.render.ffmpeg.video_bitrate = 1150
+bpy.context.scene.render.ffmpeg.maxrate = 1150
+bpy.context.scene.render.ffmpeg.minrate = 1150
+bpy.context.scene.render.ffmpeg.buffersize = 40 * 8
+bpy.context.scene.render.ffmpeg.packetsize = 2324
+bpy.context.scene.render.ffmpeg.muxrate = 2352 * 75 * 8
 
-bpy.context.scene.render.ffmpeg_audio_bitrate = 224
-bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
-bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"
+bpy.context.scene.render.ffmpeg.audio_bitrate = 224
+bpy.context.scene.render.ffmpeg.audio_mixrate = 44100
+bpy.context.scene.render.ffmpeg.audio_codec = "MP2"
+bpy.context.scene.render.ffmpeg.audio_channels = "STEREO"
diff --git a/release/scripts/presets/ffmpeg/h264.py b/release/scripts/presets/ffmpeg/h264.py
index 1cd5d61a926..e1dbdc1d8b9 100644
--- a/release/scripts/presets/ffmpeg/h264.py
+++ b/release/scripts/presets/ffmpeg/h264.py
@@ -1,17 +1,17 @@
 import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
-bpy.context.scene.render.ffmpeg_format = "H264"
-bpy.context.scene.render.ffmpeg_codec = "H264"
+bpy.context.scene.render.ffmpeg.format = "H264"
+bpy.context.scene.render.ffmpeg.codec = "H264"
 
 if is_ntsc:
-    bpy.context.scene.render.ffmpeg_gopsize = 18
+    bpy.context.scene.render.ffmpeg.gopsize = 18
 else:
-    bpy.context.scene.render.ffmpeg_gopsize = 15
+    bpy.context.scene.render.ffmpeg.gopsize = 15
 
-bpy.context.scene.render.ffmpeg_video_bitrate = 6000
-bpy.context.scene.render.ffmpeg_maxrate = 9000
-bpy.context.scene.render.ffmpeg_minrate = 0
-bpy.context.scene.render.ffmpeg_buffersize = 224 * 8
-bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg.video_bitrate = 6000
+bpy.context.scene.render.ffmpeg.maxrate = 9000
+bpy.context.scene.render.ffmpeg.minrate = 0
+bpy.context.scene.render.ffmpeg.buffersize = 224 * 8
+bpy.context.scene.render.ffmpeg.packetsize = 2048
+bpy.context.scene.render.ffmpeg.muxrate = 10080000
diff --git a/release/scripts/presets/ffmpeg/theora.py b/release/scripts/presets/ffmpeg/theora.py
index 9a35227ad57..88f1ac9bbae 100644
--- a/release/scripts/presets/ffmpeg/theora.py
+++ b/release/scripts/presets/ffmpeg/theora.py
@@ -1,17 +1,17 @@
 import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
-bpy.context.scene.render.ffmpeg_format = "OGG"
-bpy.context.scene.render.ffmpeg_codec = "THEORA"
+bpy.context.scene.render.ffmpeg.format = "OGG"
+bpy.context.scene.render.ffmpeg.codec = "THEORA"
 
 if is_ntsc:
-    bpy.context.scene.render.ffmpeg_gopsize = 18
+    bpy.context.scene.render.ffmpeg.gopsize = 18
 else:
-    bpy.context.scene.render.ffmpeg_gopsize = 15
+    bpy.context.scene.render.ffmpeg.gopsize = 15
 
-bpy.context.scene.render.ffmpeg_video_bitrate = 6000
-bpy.context.scene.render.ffmpeg_maxrate = 9000
-bpy.context.scene.render.ffmpeg_minrate = 0
-bpy.context.scene.render.ffmpeg_buffersize = 224 * 8
-bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg.video_bitrate = 6000
+bpy.context.scene.render.ffmpeg.maxrate = 9000
+bpy.context.scene.render.ffmpeg.minrate = 0
+bpy.context.scene.render.ffmpeg.buffersize = 224 * 8
+bpy.context.scene.render.ffmpeg.packetsize = 2048
+bpy.context.scene.render.ffmpeg.muxrate = 10080000
diff --git a/release/scripts/presets/ffmpeg/xvid.py b/release/scripts/presets/ffmpeg/xvid.py
index c006ba267cc..e69ab663dc8 100644
--- a/release/scripts/presets/ffmpeg/xvid.py
+++ b/release/scripts/presets/ffmpeg/xvid.py
@@ -1,16 +1,16 @@
 import bpy
 is_ntsc = (bpy.context.scene.render.fps != 25)
 
-bpy.context.scene.render.ffmpeg_format = "XVID"
+bpy.context.scene.render.ffmpeg.format = "XVID"
 
 if is_ntsc:
-    bpy.context.scene.render.ffmpeg_gopsize = 18
+    bpy.context.scene.render.ffmpeg.gopsize = 18
 else:
-    bpy.context.scene.render.ffmpeg_gopsize = 15
+    bpy.context.scene.render.ffmpeg.gopsize = 15
 
-bpy.context.scene.render.ffmpeg_video_bitrate = 6000
-bpy.context.scene.render.ffmpeg_maxrate = 9000
-bpy.context.scene.render.ffmpeg_minrate = 0
-bpy.context.scene.render.ffmpeg_buffersize = 224 * 8
-bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
+bpy.context.scene.render.ffmpeg.video_bitrate = 6000
+bpy.context.scene.render.ffmpeg.maxrate = 9000
+bpy.context.scene.render.ffmpeg.minrate = 0
+bpy.context.scene.render.ffmpeg.buffersize = 224 * 8
+bpy.context.scene.render.ffmpeg.packetsize = 2048
+bpy.context.scene.render.ffmpeg.muxrate = 10080000
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 930f1914c34..a4fa3120382 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -472,33 +472,35 @@ class RENDER_PT_output(RenderButtonsPanel, Panel):
             layout.operator("scene.render_data_set_quicktime_codec")
 
         elif file_format == 'QUICKTIME_QTKIT':
+            quicktime = rd.quicktime
+
             split = layout.split()
             col = split.column()
-            col.prop(rd, "quicktime_codec_type", text="Video Codec")
-            col.prop(rd, "quicktime_codec_spatial_quality", text="Quality")
+            col.prop(quicktime, "codec_type", text="Video Codec")
+            col.prop(quicktime, "codec_spatial_quality", text="Quality")
 
             # Audio
-            col.prop(rd, "quicktime_audiocodec_type", text="Audio Codec")
-            if rd.quicktime_audiocodec_type != 'No audio':
+            col.prop(quicktime, "audiocodec_type", text="Audio Codec")
+            if quicktime.audiocodec_type != 'No audio':
                 split = layout.split()
-                if rd.quicktime_audiocodec_type == 'LPCM':
-                    split.prop(rd, "quicktime_audio_bitdepth", text="")
+                if quicktime.audiocodec_type == 'LPCM':
+                    split.prop(quicktime, "audio_bitdepth", text="")
 
-                split.prop(rd, "quicktime_audio_samplerate", text="")
+                split.prop(quicktime, "audio_samplerate", text="")
 
                 split = layout.split()
                 col = split.column()
-                if rd.quicktime_audiocodec_type == 'AAC':
-                    col.prop(rd, "quicktime_audio_bitrate")
+                if quicktime.audiocodec_type == 'AAC':
+                    col.prop(quicktime, "audio_bitrate")
 
                 subsplit = split.split()
                 col = subsplit.column()
 
-                if rd.quicktime_audiocodec_type == 'AAC':
-                    col.prop(rd, "quicktime_audio_codec_isvbr")
+                if rquicktime.audiocodec_type == 'AAC':
+                    col.prop(quicktime, "audio_codec_isvbr")
 
                 col = subsplit.column()
-                col.prop(rd, "quicktime_audio_resampling_hq")
+                col.prop(quicktime, "audio_resampling_hq")
 
 
 class RENDER_PT_encoding(RenderButtonsPanel, Panel):
@@ -515,45 +517,46 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
         layout = self.layout
 
         rd = context.scene.render
+        ffmpeg = rd.ffmpeg
 
         layout.menu("RENDER_MT_ffmpeg_presets", text="Presets")
 
         split = layout.split()
-        split.prop(rd, "ffmpeg_format")
-        if rd.ffmpeg_format in {'AVI', 'QUICKTIME', 'MKV', 'OGG'}:
-            split.prop(rd, "ffmpeg_codec")
-        elif rd.ffmpeg_format == 'H264':
-            split.prop(rd, 'ffmpeg_lossless_output')
+        split.prop(rd.ffmpeg, "format")
+        if ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG'}:
+            split.prop(ffmpeg, "codec")
+        elif rd.ffmpeg.format == 'H264':
+            split.prop(ffmpeg, 'use_lossless_output')
         else:
             split.label()
 
         row = layout.row()
-        row.prop(rd, "ffmpeg_video_bitrate")
-        row.prop(rd, "ffmpeg_gopsize")
+        row.prop(ffmpeg, "video_bitrate")
+        row.prop(ffmpeg, "gopsize")
 
         split = layout.split()
 
         col = split.column()
         col.label(text="Rate:")
-        col.prop(rd, "ffmpeg_minrate", text="Minimum")
-        col.prop(rd, "ffmpeg_maxrate", text="Maximum")
-        col.prop(rd, "ffmpeg_buffersize", text="Buffer")
+        col.prop(ffmpeg, "minrate", text="Minimum")
+        col.prop(ffmpeg, "maxrate", text="Maximum")
+        col.prop(ffmpeg, "buffersize", text="Buffer")
 
         col = split.column()
-        col.prop(rd, "ffmpeg_autosplit")
+        col.prop(ffmpeg, "use_autosplit")
         col.label(text="Mux:")
-        col.prop(rd, "ffmpeg_muxrate", text="Rate")
-        col.prop(rd, "ffmpeg_packetsize", text="Packet Size")
+        col.prop(ffmpeg, "muxrate", text="Rate")
+        col.prop(ffmpeg, "packetsize", text="Packet Size")
 
         layout.separator()
 
         # Audio:
-        if rd.ffmpeg_format not in {'MP3'}:
-            layout.prop(rd, "ffmpeg_audio_codec", text="Audio Codec")
+        if ffmpeg.format not in {'MP3'}:
+            layout.prop(ffmpeg, "audio_codec", text="Audio Codec")
 
         row = layout.row()
-        row.prop(rd, "ffmpeg_audio_bitrate")
-        row.prop(rd, "ffmpeg_audio_volume", slider=True)
+        row.prop(ffmpeg, "audio_bitrate")
+        row.prop(ffmpeg, "audio_volume", slider=True)
 
 
 class RENDER_PT_bake(RenderButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index b7218e4ba47..7879f15270a 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -54,6 +54,7 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel):
         layout = self.layout
         scene = context.scene
         rd = context.scene.render
+        ffmpeg = rd.ffmpeg
 
         layout.prop(scene, "audio_volume")
         layout.operator("sound.bake_animation")
@@ -68,8 +69,8 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel):
 
         col = split.column()
         col.label("Format:")
-        col.prop(rd, "ffmpeg_audio_channels", text="")
-        col.prop(rd, "ffmpeg_audio_mixrate", text="Rate")
+        col.prop(ffmpeg, "audio_channels", text="")
+        col.prop(ffmpeg, "audio_mixrate", text="Rate")
 
         layout.operator("sound.mixdown")