X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdecklink%2Fproducer%2Fdecklink_producer.cpp;h=3ab2706499a86fd5b4aac598139009f8271334e0;hb=6016fd682b267d2886babd51b1faa9cdd1812d54;hp=54c84152be7b6dd9da1cb8c9d036b2c19f53d17d;hpb=0b0991ee9118226b405a2529ebb4456691d18cb8;p=casparcg

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 54c84152b..3ab270649 100644
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -36,7 +36,7 @@
 #include <common/memory/memclr.h>
 
 #include <core/mixer/write_frame.h>
-#include <core/producer/frame/audio_transform.h>
+#include <core/producer/frame/frame_transform.h>
 #include <core/producer/frame/frame_factory.h>
 
 #include <tbb/concurrent_queue.h>
@@ -184,8 +184,8 @@ public:
 			av_frame->format			= PIX_FMT_UYVY422;
 			av_frame->width				= video->GetWidth();
 			av_frame->height			= video->GetHeight();
-			av_frame->interlaced_frame	= format_desc_.mode != core::video_mode::progressive;
-			av_frame->top_field_first	= format_desc_.mode == core::video_mode::upper ? 1 : 0;
+			av_frame->interlaced_frame	= format_desc_.field_mode != core::field_mode::progressive;
+			av_frame->top_field_first	= format_desc_.field_mode == core::field_mode::upper ? 1 : 0;
 					
 			BOOST_FOREACH(auto& av_frame2, filter_.execute(av_frame))
 				muxer_.push(av_frame2);		
@@ -195,10 +195,10 @@ public:
 			{
 				auto sample_frame_count = audio->GetSampleFrameCount();
 				auto audio_data = reinterpret_cast<short*>(bytes);
-				muxer_.push(std::make_shared<std::vector<int16_t>>(audio_data, audio_data + sample_frame_count*2));
+				muxer_.push(std::make_shared<std::vector<int32_t>>(audio_data, audio_data + sample_frame_count*2));
 			}
 			else
-				muxer_.push(std::make_shared<std::vector<int16_t>>(frame_factory_->get_video_format_desc().audio_samples_per_frame, 0));
+				muxer_.push(std::make_shared<std::vector<int32_t>>(frame_factory_->get_video_format_desc().audio_samples_per_frame, 0));
 					
 			muxer_.commit();