QTKit (OSX 64bit): Add audio export to Quicktime

Supports default OSX codecs : Linear PCM, Apple Lossless and AAC

Note that AAC codec doesn't support sample rates above 48kHz. If a python/rna guru knows how to easily enforce this limit, he is welcome!

Enjoy making Quicktime movies now with audio!

1 files changed, 26 insertions, 2 deletions

diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py
index 2d20a948278..57cd23e64ef 100644
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -362,13 +362,37 @@ class RENDER_PT_output(RenderButtonsPanel):
 
         elif rd.file_format == 'QUICKTIME_CARBON':
             split = layout.split()
-            split.operator("scene.render_set_quicktime_codec")
+            split.operator("scene.render_data_set_quicktime_codec")
 
         elif rd.file_format == 'QUICKTIME_QTKIT':
             split = layout.split()
             col = split.column()
-            col.prop(rd, "quicktime_codec_type")
+            col.prop(rd, "quicktime_codec_type", text="Video Codec")
             col.prop(rd, "quicktime_codec_spatial_quality", text="Quality")
+            
+            #Audio
+            col.prop(rd,"quicktime_audiocodec_type", text="Audio Codec")
+            if rd.quicktime_audiocodec_type != 'No audio':
+                split = layout.split()
+                col = split.column()
+                if rd.quicktime_audiocodec_type == 'LPCM':
+                    col.prop(rd,"quicktime_audio_bitdepth", text="")
+                if wide_ui:
+                    col = split.column()
+                col.prop(rd,"quicktime_audio_samplerate", text="")
+
+                split = layout.split()
+                col = split.column()
+                if rd.quicktime_audiocodec_type == 'AAC':
+                    col.prop(rd,"quicktime_audio_bitrate")
+                if wide_ui:
+                    subsplit = split.split()
+                    col = subsplit.column()
+                if rd.quicktime_audiocodec_type == 'AAC':
+                    col.prop(rd,"quicktime_audio_codec_isvbr")
+                if wide_ui:
+                    col = subsplit.column()
+                col.prop(rd,"quicktime_audio_resampling_hq")
 
 
 class RENDER_PT_encoding(RenderButtonsPanel):