2.0.2: bluefish_consumer: 24bit audio support.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1726 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index bf28876238bf33ebb9180dc7cb3a0a5ed3560d1f..161039064617b0d510c85f27df093d7e2be230d8 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -233,7 +233,7 @@ public:
 \r
                if(embedded_audio_)\r
                {               \r
-                       auto frame_audio = core::audio_32_to_16(frame->audio_data());                   \r
+                       auto frame_audio = core::audio_32_to_24(frame->audio_data());                   \r
                        encode_hanc(reinterpret_cast<BLUE_UINT32*>(reserved_frames_.front()->hanc_data()), frame_audio.data(), frame->audio_data().size()/format_desc_.audio_channels, format_desc_.audio_channels);\r
                                                                \r
                        blue_->system_buffer_write_async(const_cast<uint8_t*>(reserved_frames_.front()->image_data()), \r
@@ -265,7 +265,7 @@ public:
 \r
        void encode_hanc(BLUE_UINT32* hanc_data, void* audio_data, size_t audio_samples, size_t audio_nchannels)\r
        {       \r
-               const auto sample_type = AUDIO_CHANNEL_16BIT | AUDIO_CHANNEL_LITTLEENDIAN;\r
+               const auto sample_type = AUDIO_CHANNEL_24BIT | AUDIO_CHANNEL_LITTLEENDIAN;\r
                const auto emb_audio_flag = blue_emb_audio_enable | blue_emb_audio_group1_enable;\r
                \r
                hanc_stream_info_struct hanc_stream_info;\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 40e055c3743574c760528a25734f0363e52627c2..7303afce0425c0afe11e96dfef72164ae87a9c5b 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -8,13 +8,11 @@
   </paths>\r
   <channels>\r
     <channel>\r
-      <video-mode>NTSC</video-mode>\r
+      <video-mode>PAL</video-mode>\r
       <consumers>\r
-        <system-audio></system-audio>\r
         <bluefish>\r
           <embedded-audio>true</embedded-audio>\r
         </bluefish>\r
-        <screen></screen>\r
       </consumers>\r
     </channel>\r
   </channels>\r