X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=decklink_capture.cpp;h=81566cb1a5ad20d85a3be25a8b01e2c24a62906e;hb=7895dde165b0586eea324b4c9e07f8f0a2b7e1ba;hp=956c546e6f93a9b8d823e1e7475917466befb83f;hpb=1a0b54800329dd7131c4973b0850442f7ea4af28;p=nageru

diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index 956c546..81566cb 100644
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -20,6 +20,7 @@
 
 using namespace std;
 using namespace std::placeholders;
+using namespace bmusb;
 
 namespace {
 
@@ -58,7 +59,7 @@ size_t memcpy_interleaved_fastpath(uint8_t *dest1, uint8_t *dest2, const uint8_t
 		memcpy_interleaved(dest1, dest2, src, n2);
 		dest1 += n2 / 2;
 		dest2 += n2 / 2;
-		if (n2 % 1) {
+		if (n2 % 2) {
 			swap(dest1, dest2);
 		}
 		src = aligned_src;
@@ -134,7 +135,7 @@ size_t memcpy_interleaved_fastpath(uint8_t *dest1, uint8_t *dest2, const uint8_t
 }  // namespace
 
 DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
-	: card_index(card_index)
+	: card_index(card_index), card(card)
 {
 	{
 		const char *model_name;
@@ -262,6 +263,9 @@ DeckLinkCapture::~DeckLinkCapture()
 	if (has_dequeue_callbacks) {
 		dequeue_cleanup_callback();
 	}
+	input->Release();
+	config->Release();
+	card->Release();
 }
 
 HRESULT STDMETHODCALLTYPE DeckLinkCapture::QueryInterface(REFIID, LPVOID *)
@@ -381,10 +385,12 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
 void DeckLinkCapture::configure_card()
 {
 	if (video_frame_allocator == nullptr) {
-		set_video_frame_allocator(new MallocFrameAllocator(FRAME_SIZE, NUM_QUEUED_VIDEO_FRAMES));  // FIXME: leak.
+		owned_video_frame_allocator.reset(new MallocFrameAllocator(FRAME_SIZE, NUM_QUEUED_VIDEO_FRAMES));
+		set_video_frame_allocator(owned_video_frame_allocator.get());
 	}
 	if (audio_frame_allocator == nullptr) {
-		set_audio_frame_allocator(new MallocFrameAllocator(65536, NUM_QUEUED_AUDIO_FRAMES));  // FIXME: leak.
+		owned_audio_frame_allocator.reset(new MallocFrameAllocator(65536, NUM_QUEUED_AUDIO_FRAMES));
+		set_audio_frame_allocator(owned_audio_frame_allocator.get());
 	}
 }