Integrate PyroEnc support.

Author: Themaister

.gitmodules

@@ -46,3 +46,6 @@
 [submodule "third_party/sdl3"]
 	path = third_party/sdl3
 	url = https://github.com/libsdl-org/SDL
+[submodule "third_party/pyroenc"]
+	path = third_party/pyroenc
+	url = https://github.com/HansKristian-Work/pyroenc

assets/shaders/inc/srgb.h

@@ -9,4 +9,12 @@ mediump vec3 decode_srgb(mediump vec3 c)
 	return clamp(mix(pow_side, small_side, small), vec3(0.0), vec3(1.0));
 }
 
-#endif
+mediump vec3 encode_srgb(mediump vec3 c)
+{
+	bvec3 small = lessThanEqual(c, vec3(0.0031308));
+	mediump vec3 small_side = c * 12.92;
+	mediump vec3 pow_side = 1.055 * pow(c, vec3(1.0 / 2.4)) - 0.055;
+	return clamp(mix(pow_side, small_side, small), vec3(0.0), vec3(1.0));
+}
+
+#endif

assets/shaders/util/rgb_scale.comp

@@ -0,0 +1,42 @@
+#version 450
+layout(local_size_x = 8, local_size_y = 8) in;
+
+layout(set = 0, binding = 0) uniform mediump sampler2D uImage;
+layout(set = 0, binding = 1) writeonly uniform mediump image2D uOutput;
+
+layout(constant_id = 0) const bool ENCODE_SRGB = false;
+
+#include "../post/lanczos2.h"
+#include "../inc/srgb.h"
+
+layout(push_constant) uniform Registers
+{
+    uvec2 resolution;
+    vec2 inv_resolution;
+    vec2 input_resolution;
+    vec2 inv_input_resolution;
+    float dither_strength;
+} registers;
+
+#define D(x) ((x) - 0.5)
+const mediump float dither[] = float[](
+    D(0.0625), D(0.5625), D(0.1875), D(0.6875),
+    D(0.8125), D(0.3125), D(0.9375), D(0.4375),
+    D(0.25), D(0.75), D(0.125), D(0.625),
+    D(1.00), D(0.5), D(0.875), D(0.375));
+
+void main()
+{
+    uvec2 coord = gl_GlobalInvocationID.xy;
+    if (all(lessThan(coord, registers.resolution)))
+    {
+        vec2 uv = (vec2(coord) + 0.5) * registers.inv_resolution;
+        mediump vec3 rgb = lanczos2(uImage, uv * registers.input_resolution, registers.inv_input_resolution);
+
+        if (ENCODE_SRGB)
+            rgb = encode_srgb(rgb);
+
+        rgb += dither[(coord.y & 3u) * 4 + (coord.x & 3u)] * registers.dither_strength;
+        imageStore(uOutput, ivec2(coord), vec4(rgb, 1.0));
+    }
+}

tests/video_encode_test.cpp

@@ -21,6 +21,9 @@ int main()
 	options.width = 640;
 	options.height = 480;
 	options.frame_timebase = { 1, 60 };
+	options.encoder = "h264_pyro";
+	options.low_latency = true;
+	options.realtime = true;
 
 	if (!Vulkan::Context::init_loader(nullptr))
 		return 1;
@@ -29,12 +32,8 @@ int main()
 	Vulkan::Context ctx;
 	ctx.set_system_handles(handles);
 	if (!ctx.init_instance_and_device(nullptr, 0, nullptr, 0,
-#ifdef VK_ENABLE_BETA_EXTENSIONS
 	                                  Vulkan::CONTEXT_CREATION_ENABLE_VIDEO_ENCODE_BIT |
 	                                  Vulkan::CONTEXT_CREATION_ENABLE_VIDEO_H264_BIT))
-#else
-                                      0))
-#endif
 	{
 		return 1;
 	}
@@ -57,7 +56,42 @@ int main()
 		LOGE("Failed to open /tmp/test.ogg.\n");
 #endif
 
-	if (!encoder.init(&device, "/tmp/test.mkv", options))
+	struct CB : Granite::MuxStreamCallback
+	{
+		void set_codec_parameters(const pyro_codec_parameters &) override
+		{
+			LOGI("Setting codec parameters.\n");
+		}
+
+		void write_video_packet(int64_t, int64_t, const void *data, size_t size, bool) override
+		{
+			if (fwrite(data, 1, size, file) != size)
+				LOGE("Failed to write.\n");
+		}
+
+		void write_audio_packet(int64_t pts, int64_t dts, const void *data, size_t size) override
+		{
+			LOGI("Got audio.\n");
+		}
+
+		bool should_force_idr() override
+		{
+			return false;
+		}
+
+		FILE *file = nullptr;
+	} cb;
+
+	cb.file = fopen("/tmp/test.h264", "wb");
+	if (!cb.file)
+	{
+		LOGE("Failed to open file.\n");
+		return EXIT_FAILURE;
+	}
+
+	encoder.set_mux_stream_callback(&cb);
+
+	if (!encoder.init(&device, nullptr, options))
 	{
 		LOGE("Failed to init codec.\n");
 		return 1;
@@ -74,6 +108,8 @@ int main()
 			"builtin://shaders/util/rgb_to_yuv.comp")->register_variant({})->get_program();
 	shaders.chroma_downsample = device.get_shader_manager().register_compute(
 			"builtin://shaders/util/chroma_downsample.comp")->register_variant({})->get_program();
+	shaders.rgb_scale = device.get_shader_manager().register_compute(
+			"builtin://shaders/util/rgb_scale.comp")->register_variant({})->get_program();
 	auto pipe = encoder.create_ycbcr_pipeline(shaders);
 
 	for (unsigned i = 0; i < 1000; i++)
@@ -116,6 +152,8 @@ int main()
 		device.next_frame_context();
 	}
 
+	fclose(cb.file);
+
 #ifdef HAVE_GRANITE_AUDIO
 	Global::stop_audio_system();
 #endif

third_party/CMakeLists.txt

@@ -130,3 +130,5 @@ if (GRANITE_VULKAN_SYSTEM_HANDLES AND GRANITE_RENDERER)
     # Custom integration, bypass all the noise.
     add_subdirectory(fsr2/src/ffx-fsr2-api/granite)
 endif()
+
+add_subdirectory(pyroenc EXCLUDE_FROM_ALL)

third_party/pyroenc

@@ -17,5 +17,6 @@ endif()
 if (GRANITE_FFMPEG_VULKAN)
     target_compile_definitions(granite-video PRIVATE HAVE_FFMPEG_VULKAN)
 endif()
+target_link_libraries(granite-video PRIVATE pyroenc)
 target_include_directories(granite-video PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_definitions(granite-video PUBLIC HAVE_GRANITE_FFMPEG)