Support ubuntu 22.04

examples/viewer/opengl/k4adepthpixelcolorizer.h

@@ -36,7 +36,7 @@ class K4ADepthPixelColorizer
                                               const DepthPixel &min,
                                               const DepthPixel &max)
     {
-        constexpr uint8_t PixelMax = std::numeric_limits<uint8_t>::max();
+        constexpr uint8_t PixelMax = UINT8_MAX;
 
         // Default to opaque black.
         //
@@ -90,7 +90,7 @@ class K4ADepthPixelColorizer
         //
         DepthPixel pixelValue = std::min(value, max);
 
-        constexpr uint8_t PixelMax = std::numeric_limits<uint8_t>::max();
+        constexpr uint8_t PixelMax = UINT8_MAX;
         const auto normalizedValue = static_cast<uint8_t>((pixelValue - min) * (double(PixelMax) / (max - min)));
 
         // All color channels are set the same (image is greyscale)

extern/libebml/CMakeLists.txt

@@ -12,4 +12,4 @@ else()
     message(STATUS "ebml is already a target. Skipping adding it twice")
 endif()
 
-add_library(ebml::ebml ALIAS ebml)
+add_library(EBML::ebml ALIAS ebml)

extern/libmatroska/CMakeLists.txt

@@ -10,11 +10,11 @@ if (NOT TARGET matroska)
     # This is a hack to trick libmatroska into thinking there is an installed
     # version of ebml. In reality, ebml is already a target since its source is
     # part of the build graph.
-    set(Ebml_DIR "${CMAKE_CURRENT_LIST_DIR}")
+    set(EBML_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
     add_subdirectory(src EXCLUDE_FROM_ALL)
 else()
     message(STATUS "matroska is already a target. Skipping adding it twice")
 endif()
 
-add_library(matroska::matroska ALIAS matroska)
+add_library(Matroska::matroska ALIAS matroska)

extern/libmatroska/EbmlConfigVersion.cmake → extern/libmatroska/EBMLConfigVersion.cmake

@@ -2,6 +2,6 @@
 # version of ebml. In reality, ebml is already a target since its source is
 # part of the build graph.
 
-set(PACKAGE_VERSION 1.3.5)
+set(PACKAGE_VERSION 1.4.4)
 set(PACKAGE_VERSION_EXACT YES)
 set(PACKAGE_VERSION_EXACT YES)

include/k4ainternal/matroska_common.h

@@ -142,7 +142,7 @@ class LargeFileIOCallback : public libebml::IOCallback
     LargeFileIOCallback(const char *path, const open_mode mode);
     ~LargeFileIOCallback() override;
 
-    uint32 read(void *buffer, size_t size) override;
+    size_t read(void *buffer, size_t size) override;
     void setFilePointer(int64 offset, libebml::seek_mode mode = libebml::seek_beginning) override;
     size_t write(const void *buffer, size_t size) override;
     uint64 getFilePointer() override;

scripts/docker/Dockerfile

@@ -1,10 +1,11 @@
-ARG UBUNTU_VERSION=18.04
+ARG UBUNTU_VERSION=22.04
 # Use the official ubuntu:18.04 image as the parent image
 FROM ubuntu:${UBUNTU_VERSION}
 
 # Set the working directory to /app
 WORKDIR /app
 
+ARG UBUNTU_VERSION
 ARG ARCH=amd64
 
 ADD setup-ubuntu.sh /app
@@ -13,8 +14,9 @@ ADD sources.list /app
 # Tell Ubuntu non-interactive install
 ARG DEBIAN_FRONTEND=noninteractive
 
+RUN echo ubuntu version ${UBUNTU_VERSION}
 
-RUN ./setup-ubuntu.sh ${ARCH}
+RUN bash ./setup-ubuntu.sh ${ARCH} ${UBUNTU_VERSION}
 
 RUN apt-get install -y ca-certificates
 RUN update-ca-certificates

scripts/docker/setup-ubuntu.sh

@@ -1,36 +1,28 @@
 #!/bin/bash
 
-# Usage:
-# ./setup-ubuntu.sh [arm64 | amd64]
+if [ "$1" = "" ] || [ "$2" = "" ]; then
+  echo "Please execute with target device and image.
+$0 target_device image
 
-# Warning! This will override your sources.list file!!
-
-arch=amd64
-
-# Copy off old sources.list file
-cp /etc/apt/sources.list /etc/apt/sources.list.old
-echo "Backed up /etc/apt/sources.list to /etc/apt/sources.list.old"
+Usage:
+$0 [arm64 | amd64] [ubuntu-version like 22.04]"
+  exit 1
+fi
 
-# Copy over the new file
-cp sources.list /etc/apt/sources.list
-echo "Overwrote /etc/apt/sources.list with sources.list"
+arch=$1
+UBUNTU_VERSION=$2
 
 apt-get update
 
 apt-get install wget -y
 
 # Add Public microsoft repo keys to the image
-wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
-dpkg -i packages-microsoft-prod.deb
-
-if [ "$1" = "arm64" ]; then
-    arch="arm64"
-fi
+wget -q https://packages.microsoft.com/config/ubuntu/${UBUNTU_VERSION}/packages-microsoft-prod.deb -P /tmp
+dpkg -i /tmp/packages-microsoft-prod.deb
 
 echo "Setting up for building $arch binaries"
 
-dpkg --add-architecture amd64
-dpkg --add-architecture arm64
+dpkg --add-architecture $arch
 
 apt-get update
 
@@ -72,4 +64,4 @@ if [ "$arch" = "amd64" ]; then
     packages+=(libopencv-dev:$arch)
 fi
 
-apt-get install -y --no-install-recommends ${packages[@]}
+apt-get install -y --no-install-recommends ${packages[@]}

src/record/internal/CMakeLists.txt

@@ -22,15 +22,15 @@ target_include_directories(k4a_playback PUBLIC
 target_link_libraries(k4a_record PUBLIC 
     k4a::k4a
     k4ainternal::logging
-    ebml::ebml
-    matroska::matroska
+    EBML::ebml
+    Matroska::matroska
 )
 
 target_link_libraries(k4a_playback PUBLIC 
     k4a::k4a
     k4ainternal::logging
-    ebml::ebml
-    matroska::matroska
+    EBML::ebml
+    Matroska::matroska
     libyuv::libyuv
     libjpeg-turbo::libjpeg-turbo
 )

src/record/internal/iocallback.cpp

@@ -41,7 +41,7 @@ LargeFileIOCallback::~LargeFileIOCallback()
     close();
 }
 
-uint32 LargeFileIOCallback::read(void *buffer, size_t size)
+size_t LargeFileIOCallback::read(void *buffer, size_t size)
 {
     assert(size <= UINT32_MAX); // can't properly return > uint32
     assert(m_owner == std::this_thread::get_id());

src/record/sdk/CMakeLists.txt

@@ -40,8 +40,8 @@ target_link_libraries(k4arecord PRIVATE
     k4ainternal::record
     k4ainternal::playback
     k4ainternal::logging
-    ebml::ebml
-    matroska::matroska
+    EBML::ebml
+    Matroska::matroska
 )
 
 target_link_libraries(k4arecord PUBLIC

tools/k4aviewer/k4adepthpixelcolorizer.h

@@ -36,7 +36,7 @@ class K4ADepthPixelColorizer
                                               const DepthPixel &min,
                                               const DepthPixel &max)
     {
-        constexpr uint8_t PixelMax = std::numeric_limits<uint8_t>::max();
+        constexpr uint8_t PixelMax = UINT8_MAX;
 
         // Default to opaque black.
         //
@@ -90,7 +90,7 @@ class K4ADepthPixelColorizer
         //
         DepthPixel pixelValue = std::min(value, max);
 
-        constexpr uint8_t PixelMax = std::numeric_limits<uint8_t>::max();
+        constexpr uint8_t PixelMax = UINT8_MAX;
         const auto normalizedValue = static_cast<uint8_t>((pixelValue - min) * (double(PixelMax) / (max - min)));
 
         // All color channels are set the same (image is greyscale)