Add webp support

Uses modified libwebp @ v1.5.0 to allow images larger than 16k pixels.

Co-authored-by: Pierre-Anthony Lemieux <pal@palemieux.com>

Author: jzern

.gitmodules

@@ -26,3 +26,6 @@
 [submodule "ext/libavif"]
 	path = ext/libavif
 	url = https://github.com/AOMediaCodec/libavif.git
+[submodule "ext/libwebp"]
+	path = ext/libwebp
+	url = https://chromium.googlesource.com/webm/libwebp

CMakeLists.txt

@@ -59,6 +59,10 @@ set(JPEGXL_ENABLE_MANPAGES FALSE CACHE INTERNAL "" FORCE)
 set(JPEGXL_ENABLE_AVX512 TRUE CACHE INTERNAL "" FORCE)
 add_subdirectory(ext/libjxl EXCLUDE_FROM_ALL)
 
+# webp
+
+add_subdirectory(ext/libwebp EXCLUDE_FROM_ALL)
+
 # ffmpeg
 
 #   CONFIGURE_COMMAND ./configure --disable-avdevice --disable-avformat --disable-swresample --disable-swscale --disable-avfilter --disable-doc --disable-programs --prefix=${FFMPEG_INSTALL_DIR}
@@ -90,7 +94,7 @@ add_library(md5 ext/crypto-algorithms/md5.c)
 
 file(GLOB LIBENCH_SRC_FILES src/main/cpp/*)
 add_executable(libench ${LIBENCH_SRC_FILES} ext/lodepng/lodepng.cpp)
-target_link_libraries(libench openjph md5 avif jxl libavcodec libavutil ${KDU_LIBRARY} ${CMAKE_DL_LIBS})
+target_link_libraries(libench openjph md5 avif jxl webp libavcodec libavutil ${KDU_LIBRARY} ${CMAKE_DL_LIBS})
 
 # tests
 
@@ -110,4 +114,6 @@ add_test(NAME "png" COMMAND libench png ${PROJECT_SOURCE_DIR}/src/test/resources
 add_test(NAME "ffv1" COMMAND libench ffv1 ${PROJECT_SOURCE_DIR}/src/test/resources/images/test1.png)
 add_test(NAME "ffv1-rgba" COMMAND libench ffv1 ${PROJECT_SOURCE_DIR}/src/test/resources/images/rgba.png)
 add_test(NAME "ffv1-yuv" COMMAND libench ffv1 ${PROJECT_SOURCE_DIR}/src/test/resources/images/loc.720x243.yuv422p10le.yuv)
+add_test(NAME "webp-rgb" COMMAND libench webp ${PROJECT_SOURCE_DIR}/src/test/resources/images/test1.png)
+add_test(NAME "webp-rgba" COMMAND libench webp ${PROJECT_SOURCE_DIR}/src/test/resources/images/rgba.png)
 

ext/libwebp

@@ -6,6 +6,7 @@
 #include "ojph_codec.h"
 #include "png_codec.h"
 #include "qoi_codec.h"
+#include "webp_codec.h"
 #include <chrono>
 #include <fstream>
 #include <iomanip>
@@ -185,6 +186,9 @@ int main(int argc, char* argv[]) {
   } else if (result["codec"].as<std::string>() == "ffv1") {
     encoder.reset(new libench::FFV1Encoder());
     decoder.reset(new libench::FFV1Decoder());
+  } else if (result["codec"].as<std::string>() == "webp") {
+    encoder.reset(new libench::WEBPEncoder());
+    decoder.reset(new libench::WEBPDecoder());
   } else {
     throw std::runtime_error("Unknown encoder");
   }

src/main/cpp/main.cpp

@@ -0,0 +1,104 @@
+#include "webp_codec.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
+#include <cstdint>
+#include <stdexcept>
+
+/*
+ * WEBPEncoder
+ */
+
+libench::WEBPEncoder::WEBPEncoder() {
+  WebPMemoryWriterInit(&this->writer_);
+};
+
+libench::WEBPEncoder::~WEBPEncoder() {
+  WebPMemoryWriterClear(&this->writer_);
+};
+
+libench::CodestreamContext libench::WEBPEncoder::encodeRGB8(const ImageContext &image) {
+  return this->encode8(image);
+}
+
+libench::CodestreamContext libench::WEBPEncoder::encodeRGBA8(const ImageContext &image) {
+  return this->encode8(image);
+}
+
+libench::CodestreamContext libench::WEBPEncoder::encode8(const ImageContext &image) {
+  WebPMemoryWriterClear(&this->writer_);
+
+  WebPConfig config;
+  WebPPicture pic;
+  const int level = 6;  // 0 (faster) - 9 (slower)
+  if (!WebPConfigInit(&config) || !WebPConfigLosslessPreset(&config, level) || !WebPPictureInit(&pic))
+    throw std::runtime_error("WEBP encode failed");
+
+  const int num_comps = image.format.comps.num_comps;
+  const int rgb_stride = image.width * num_comps;
+  pic.width = image.width;
+  pic.height = image.height;
+  pic.use_argb = 1;
+  int ret = num_comps == 3 ?
+      WebPPictureImportRGB(&pic, image.planes8[0], rgb_stride) :
+      WebPPictureImportRGBA(&pic, image.planes8[0], rgb_stride);
+  if (!ret) {
+    WebPPictureFree(&pic);
+    throw std::runtime_error("WEBP encode failed");
+  }
+
+  // Retain pixel values in fully transparent areas. The default will modify
+  // the (invisible) pixels to improve compression.
+  config.exact = 1;
+
+  pic.writer = WebPMemoryWrite;
+  pic.custom_ptr = &this->writer_;
+
+  if (!WebPEncode(&config, &pic)) {
+    WebPPictureFree(&pic);
+    WebPMemoryWriterClear(&this->writer_);
+    throw std::runtime_error("WEBP encode failed");
+  }
+
+  CodestreamContext cs;
+  cs.codestream = this->writer_.mem;
+  cs.size = this->writer_.size;
+  return cs;
+}
+
+/*
+ * WEBPDecoder
+ */
+
+libench::WEBPDecoder::WEBPDecoder() {
+};
+
+libench::WEBPDecoder::~WEBPDecoder() {
+  WebPFree(this->image_.planes8[0]);
+};
+
+libench::ImageContext libench::WEBPDecoder::decodeRGB8(const CodestreamContext& cs) {
+  return this->decode8(cs, 3);
+}
+
+libench::ImageContext libench::WEBPDecoder::decodeRGBA8(const CodestreamContext& cs) {
+  return this->decode8(cs, 4);
+}
+
+libench::ImageContext libench::WEBPDecoder::decode8(const CodestreamContext& cs, uint8_t num_comps) {
+  WebPFree(this->image_.planes8[0]);
+
+  this->image_.format = num_comps == 3 ? libench::ImageFormat::RGB8 : libench::ImageFormat::RGBA8;
+
+  int width, height;
+  this->image_.planes8[0] = num_comps == 3 ?
+      WebPDecodeRGB(cs.codestream, cs.size, &width, &height) :
+      WebPDecodeRGBA(cs.codestream, cs.size, &width, &height);
+
+  if (!this->image_.planes8[0])
+    throw std::runtime_error("WEBP decode failed");
+
+  this->image_.width = static_cast<uint32_t>(width);
+  this->image_.height = static_cast<uint32_t>(height);
+
+  return this->image_;
+}

src/main/cpp/webp_codec.cpp

@@ -0,0 +1,41 @@
+#ifndef LIBENCH_WEBP_H
+#define LIBENCH_WEBP_H
+
+#include "codec.h"
+#include "webp/encode.h"
+
+namespace libench {
+
+class WEBPEncoder : public Encoder {
+ public:
+  WEBPEncoder();
+  ~WEBPEncoder() override;
+
+  CodestreamContext encodeRGB8(const ImageContext &image) override;
+
+  CodestreamContext encodeRGBA8(const ImageContext &image) override;
+
+ private:
+  CodestreamContext encode8(const ImageContext &image);
+
+  WebPMemoryWriter writer_;
+};
+
+class WEBPDecoder : public Decoder {
+ public:
+  WEBPDecoder();
+  ~WEBPDecoder() override;
+
+  ImageContext decodeRGB8(const CodestreamContext& cs) override;
+
+  ImageContext decodeRGBA8(const CodestreamContext& cs) override;
+
+ private:
+  ImageContext decode8(const CodestreamContext& cs, uint8_t num_comps);
+
+  ImageContext image_;
+};
+
+}  // namespace libench
+
+#endif

src/main/cpp/webp_codec.h

@@ -45,7 +45,8 @@ class CodecInfo:
     "qoi": CodecInfo(color="#dc582a", marker="o", formats=["RGBA8", "RGB8"]),
     "png": CodecInfo(color="#f2c75c", marker="o", formats=["RGBA8", "RGB8"]),
     "ffv1": CodecInfo(color="#94a596", marker="o", formats=["RGBA8", "RGB8", "YUV"]),
-    "avif": CodecInfo(color="#5d3754", marker="o", formats=["RGBA8", "RGB8"])
+    "avif": CodecInfo(color="#5d3754", marker="o", formats=["RGBA8", "RGB8"]),
+    "webp": CodecInfo(color="#007a78", marker="o", formats=["RGBA8", "RGB8"])
 }
 
 def make_analysis(df, msg: str, fig_name: str, build_dir_path: str):

src/main/python/make_page.py

@@ -104,6 +104,10 @@
             <td><code>avif</code></td>
             <td>AVIF using <a href="https://github.com/AOMediaCodec/libavif">libavif</a></td>
           </tr>
+          <tr>
+            <td><code>webp</code></td>
+            <td>WebP using <a href="https://chromium.googlesource.com/webm/libwebp">libwebp</a></td>
+          </tr>
         </tbody>
       </table>
     </section>
@@ -146,4 +150,4 @@
   </footer>
 </body>
 
-</html>
+</html>