Add decoded input slots for render workers

tests/gtest/CMakeLists.txt

@@ -30,6 +30,7 @@ add_executable(olive-gtest
   plugin_renderer_readback_test.cpp
   plugin_ofx_integration_test.cpp
   codec_frame_test.cpp
+  codec_decoder_test.cpp
   codec_exportcodec_test.cpp
   codec_exportformat_test.cpp
   codec_encoder_test.cpp

tests/gtest/codec_decoder_test.cpp

@@ -0,0 +1,40 @@
+#include <gtest/gtest.h>
+
+#include <QFileInfo>
+
+#include "codec/decoder.h"
+
+TEST(CodecDecoder, RetrieveVideoFrameFromDemoMp4)
+{
+	const QString path = QStringLiteral("tests/demo.mp4");
+	ASSERT_TRUE(QFileInfo::exists(path));
+
+	olive::DecoderPtr decoder = olive::Decoder::CreateFromID(QStringLiteral("ffmpeg"));
+	ASSERT_TRUE(decoder);
+
+	ASSERT_TRUE(decoder->Open(olive::Decoder::CodecStream(path, 0, nullptr)));
+
+	olive::Decoder::RetrieveVideoParams params;
+	params.time = olive::rational(0);
+	params.maximum_format = olive::core::PixelFormat::U16;
+
+	olive::FramePtr frame = decoder->RetrieveVideoFrame(params);
+	ASSERT_TRUE(frame);
+	ASSERT_TRUE(frame->is_allocated());
+	EXPECT_EQ(frame->width(), 1920);
+	EXPECT_EQ(frame->height(), 1080);
+	EXPECT_EQ(frame->format(), olive::core::PixelFormat::U16);
+	EXPECT_EQ(frame->channel_count(), 4);
+	EXPECT_GT(frame->allocated_size(), 0);
+	EXPECT_GT(frame->linesize_bytes(), 0);
+
+	bool has_nonzero_byte = false;
+	const char *data = frame->const_data();
+	for (int i = 0; i < frame->allocated_size(); i++) {
+		if (data[i] != 0) {
+			has_nonzero_byte = true;
+			break;
+		}
+	}
+	EXPECT_TRUE(has_nonzero_byte);
+}

tests/gtest/render_ipc_test.cpp

@@ -274,9 +274,11 @@ TEST(IpcMessage, TypedRoundTrip)
 	HandshakeMsg hs;
 	hs.protocol_version = 1;
 	hs.shm_key = QStringLiteral("olive-rw-1234-0");
+	hs.input_shm_key = QStringLiteral("olive-in-1234-0");
 	hs.input_slots = 4;
 	hs.output_slots = 6;
 	hs.slot_data_bytes = 256ll * 1024 * 1024;
+	hs.input_slot_data_bytes = 128ll * 1024 * 1024;
 	ASSERT_TRUE(WriteMessage(&dev, hs.ToJson()));
 
 	RenderFrameMsg rf;
@@ -289,6 +291,8 @@ TEST(IpcMessage, TypedRoundTrip)
 	rf.format = 3;
 	rf.channel_count = 4;
 	rf.mode = 1;
+	rf.input_slot = 2;
+	rf.input_slots = {2, 3};
 	ASSERT_TRUE(WriteMessage(&dev, rf.ToJson()));
 
 	FrameReadyMsg fr;
@@ -308,9 +312,11 @@ TEST(IpcMessage, TypedRoundTrip)
 	ASSERT_TRUE(HandshakeMsg::FromJson(obj, &hs2));
 	EXPECT_EQ(hs2.protocol_version, 1);
 	EXPECT_EQ(hs2.shm_key, hs.shm_key);
+	EXPECT_EQ(hs2.input_shm_key, hs.input_shm_key);
 	EXPECT_EQ(hs2.input_slots, 4);
 	EXPECT_EQ(hs2.output_slots, 6);
 	EXPECT_EQ(hs2.slot_data_bytes, hs.slot_data_bytes);
+	EXPECT_EQ(hs2.input_slot_data_bytes, hs.input_slot_data_bytes);
 
 	ASSERT_TRUE(ReadMessage(&reader, &obj, &ok));
 	ASSERT_TRUE(ok);
@@ -322,6 +328,10 @@ TEST(IpcMessage, TypedRoundTrip)
 	EXPECT_EQ(rf2.time_den, 30000);
 	EXPECT_EQ(rf2.width, 1920);
 	EXPECT_EQ(rf2.format, 3);
+	EXPECT_EQ(rf2.input_slot, 2);
+	ASSERT_EQ(rf2.input_slots.size(), 2);
+	EXPECT_EQ(rf2.input_slots[0], 2);
+	EXPECT_EQ(rf2.input_slots[1], 3);
 
 	ASSERT_TRUE(ReadMessage(&reader, &obj, &ok));
 	ASSERT_TRUE(ok);
@@ -378,4 +388,4 @@ TEST(IpcMessage, WrongTypeRejected)
 
 	RenderFrameMsg rf;
 	EXPECT_FALSE(RenderFrameMsg::FromJson(obj, &rf));
-}
+}