Merge subtree commit '03d070ca7dcb9b53b8f00e85152028d9da5f7d5a'

sz3 · Nov 19, 2023 · 92a9a80 · 92a9a80
2 parents 4368143 + 03d070c
commit 92a9a80
Show file tree

Hide file tree

Showing 81 changed files with 27,477 additions and 11,558 deletions.
diff --git a/app/src/cpp/libcimbar/src/lib/cimb_translator/Config.h b/app/src/cpp/libcimbar/src/lib/cimb_translator/Config.h
@@ -98,7 +98,7 @@ namespace cimbar
 
 		static constexpr unsigned compression_level()
 		{
-			return 6;
+			return 16;
 		}
 	};
 }

diff --git a/app/src/cpp/libcimbar/src/lib/compression/zstd_compressor.h b/app/src/cpp/libcimbar/src/lib/compression/zstd_compressor.h
@@ -101,7 +101,7 @@ class zstd_compressor : public STREAM
 
 protected:
 	static const size_t CHUNK_SIZE = 0x4000;
-	int _compressionLevel = 6;
+	int _compressionLevel = 16;
 	ZSTD_CCtx* _cctx = ZSTD_createCCtx();
 	std::vector<char> _compBuff = std::vector<char>(ZSTD_compressBound(CHUNK_SIZE));
 };

diff --git a/app/src/cpp/libcimbar/src/lib/encoder/test/EncoderRoundTripTest.cpp b/app/src/cpp/libcimbar/src/lib/encoder/test/EncoderRoundTripTest.cpp
@@ -80,7 +80,7 @@ TEST_CASE( "EncoderRoundTripTest/testStreaming", "[unit]" )
 
 	// done
 	assertEquals( 1, fds.num_done() );
-	std::string decodedContents = File(tempdir.path() / "0.5387").read_all();
+	std::string decodedContents = File(tempdir.path() / "0.5256").read_all();
 	assertEquals( 16727, decodedContents.size() );
 	assertStringContains( "Mozilla Public License Version 2.0", decodedContents );
 }
diff --git a/app/src/cpp/libcimbar/src/lib/encoder/test/EncoderTest.cpp b/app/src/cpp/libcimbar/src/lib/encoder/test/EncoderTest.cpp
@@ -70,7 +70,7 @@ TEST_CASE( "EncoderTest/testFountain.Compress", "[unit]" )
 	Encoder enc(30, 4, 2);
 	assertEquals( 1, enc.encode_fountain(inputFile, outPrefix) );
 
-	uint64_t hash = 0x4fd34f01ee80a28d;
+	uint64_t hash = 0x664598a460acad14;
 	std::string path = fmt::format("{}_0.png", outPrefix);
 	cv::Mat img = cv::imread(path);
 	assertEquals( hash, image_hash::average_hash(img) );
@@ -96,7 +96,7 @@ TEST_CASE( "EncoderTest/testPiecemealFountainEncoder", "[unit]" )
 	std::optional<cv::Mat> frame = enc.encode_next(*fes);
 	assertTrue( frame );
 
-	uint64_t hash = 0xf8cde200e90582e4;
+	uint64_t hash = 0x423de068e4894a7f;
 	assertEquals( hash, image_hash::average_hash(*frame) );
 }
 
@@ -110,7 +110,7 @@ TEST_CASE( "EncoderTest/testFountain.Size", "[unit]" )
 	Encoder enc(30, 4, 2);
 	assertEquals( 1, enc.encode_fountain(inputFile, outPrefix, 10, 2.0, 1080) );
 
-	uint64_t hash = 0x8985b70d93675786;
+	uint64_t hash = 0xeb28da8af88de8d0;
 	std::string path = fmt::format("{}_0.png", outPrefix);
 	cv::Mat img = cv::imread(path);
 	assertEquals( 1080, img.rows );

diff --git a/app/src/cpp/libcimbar/src/third_party_lib/concurrentqueue/concurrentqueue.h b/app/src/cpp/libcimbar/src/third_party_lib/concurrentqueue/concurrentqueue.h
diff --git a/app/src/cpp/libcimbar/src/third_party_lib/fmt/LICENSE.rst b/app/src/cpp/libcimbar/src/third_party_lib/fmt/LICENSE.rst
@@ -1,4 +1,4 @@
-Copyright (c) 2012 - present, Victor Zverovich
+Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the