[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43354] trunk/blender: Move FFmpeg and QuickTime settings to own structure inside RenderSettings

[Sergey Sharybin]

Revision: 43354
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43354
Author:   nazgul
Date:     2012-01-13 12:34:41 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
Move FFmpeg and QuickTime settings to own structure inside RenderSettings
rather than making all properties have ffmpeg_ and quicktime_ prefixes

Modified Paths:
--------------
    trunk/blender/release/scripts/presets/ffmpeg/DV.py
    trunk/blender/release/scripts/presets/ffmpeg/DVD.py
    trunk/blender/release/scripts/presets/ffmpeg/SVCD.py
    trunk/blender/release/scripts/presets/ffmpeg/VCD.py
    trunk/blender/release/scripts/presets/ffmpeg/h264.py
    trunk/blender/release/scripts/presets/ffmpeg/theora.py
    trunk/blender/release/scripts/presets/ffmpeg/xvid.py
    trunk/blender/release/scripts/startup/bl_ui/properties_render.py
    trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
    trunk/blender/source/blender/makesrna/RNA_access.h
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/release/scripts/presets/ffmpeg/DV.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/DV.py	2012-01-13 12:34:23 UTC (rev 43353)
+++ trunk/blender/release/scripts/presets/ffmpeg/DV.py	2012-01-13 12:34:41 UTC (rev 43354)
@@ -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 @@
 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"

Modified: trunk/blender/release/scripts/presets/ffmpeg/DVD.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/DVD.py	2012-01-13 12:34:23 UTC (rev 43353)
+++ trunk/blender/release/scripts/presets/ffmpeg/DVD.py	2012-01-13 12:34:41 UTC (rev 43354)
@@ -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"

Modified: trunk/blender/release/scripts/presets/ffmpeg/SVCD.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/SVCD.py	2012-01-13 12:34:23 UTC (rev 43353)
+++ trunk/blender/release/scripts/presets/ffmpeg/SVCD.py	2012-01-13 12:34:41 UTC (rev 43354)
@@ -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"

Modified: trunk/blender/release/scripts/presets/ffmpeg/VCD.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/VCD.py	2012-01-13 12:34:23 UTC (rev 43353)
+++ trunk/blender/release/scripts/presets/ffmpeg/VCD.py	2012-01-13 12:34:41 UTC (rev 43354)
@@ -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"

Modified: trunk/blender/release/scripts/presets/ffmpeg/h264.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/h264.py	2012-01-13 12:34:23 UTC (rev 43353)
+++ trunk/blender/release/scripts/presets/ffmpeg/h264.py	2012-01-13 12:34:41 UTC (rev 43354)
@@ -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

Modified: trunk/blender/release/scripts/presets/ffmpeg/theora.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/theora.py	2012-01-13 12:34:23 UTC (rev 43353)
+++ trunk/blender/release/scripts/presets/ffmpeg/theora.py	2012-01-13 12:34:41 UTC (rev 43354)
@@ -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

Modified: trunk/blender/release/scripts/presets/ffmpeg/xvid.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/xvid.py	2012-01-13 12:34:23 UTC (rev 43353)
+++ trunk/blender/release/scripts/presets/ffmpeg/xvid.py	2012-01-13 12:34:41 UTC (rev 43354)
@@ -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

@@ Diff output truncated at 10240 characters. @@