]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Sep 2011 20:53:42 +0000 (20:53 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Sep 2011 20:53:42 +0000 (20:53 +0000)
modules/bluefish/consumer/bluefish_consumer.cpp

index c52a0b50ffa606cd80e14b5e15036a89d44e4247..d2e5a7f07386e1a382b6c380c5b55a2daaf9bddd 100644 (file)
@@ -208,7 +208,7 @@ public:
        \r
        void schedule_next_video(const safe_ptr<core::read_frame>& frame)\r
        {\r
-               static std::vector<int8_t> silence(MAX_HANC_BUFFER_SIZE, 0);\r
+               static std::vector<int16_t> silence(MAX_HANC_BUFFER_SIZE, 0);\r
                \r
                executor_.begin_invoke([=]\r
                {\r
@@ -242,7 +242,7 @@ public:
 \r
                                if(embedded_audio_)\r
                                {               \r
-                                       auto frame_audio          = core::audio_32_to_24(frame->audio_data());\r
+                                       auto frame_audio          = core::audio_32_to_16_sse(frame->audio_data());\r
                                        auto frame_audio_data = frame_audio.size() != audio_samples ? silence.data() : frame_audio.data();      \r
 \r
                                        encode_hanc(reinterpret_cast<BLUE_UINT32*>(reserved_frames_.front()->hanc_data()), frame_audio_data, audio_samples, audio_nchannels);\r
@@ -289,7 +289,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_24BIT | AUDIO_CHANNEL_LITTLEENDIAN;\r
+               const auto sample_type = AUDIO_CHANNEL_16BIT | 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