Added endianness detection and byte order conversion functions

- Detected platform endianness (Big/Little Endian) in CMake configuration
- Added conditional compilation for endianness-specific byte order conversion in oapv_app_enc.c
- Introduced helper macros (bswap16, bswap32, bswap64) and endian conversion functions (be2ne, le2ne, ne2be, ne2le) in oapv_app_util.h
- Updated metadata serialization functions to use new byte order conversion utilities for consistent cross-platform behavior

Signed-off-by: Dawid Kozinski <[email protected]>

Author: dkozinski

app/CMakeLists.txt

@@ -3,6 +3,17 @@ include_directories(${CMAKE_BINARY_DIR}/include)
 set(EXE_ENC oapv_app_enc)
 set(EXE_DEC oapv_app_dec)
 
+if(CMAKE_C_BYTE_ORDER STREQUAL "BIG_ENDIAN")
+    set(WORDS_BIGENDIAN TRUE)
+    message(STATUS "Platform is Big Endian")
+elseif(CMAKE_C_BYTE_ORDER STREQUAL "LITTLE_ENDIAN")
+    set(WORDS_BIGENDIAN FALSE)
+    message(STATUS "Platform is Little Endian")
+else()
+    set(WORDS_BIGENDIAN FALSE) 
+    message(WARNING "Endianness could not be determined, assuming Little Endian")
+endif()
+
 file(GLOB SRC_ENC "oapv_app_enc.c")
 file(GLOB INC_ENC "*.h")
 file(GLOB SRC_DEC "oapv_app_dec.c")
@@ -37,6 +48,11 @@ elseif(UNIX OR MINGW)
     target_link_libraries(${EXE_DEC} m)
 endif()
 
+if(WORDS_BIGENDIAN)
+    target_compile_definitions(${EXE_ENC} PRIVATE HAVE_BIGENDIAN ANY)
+    target_compile_definitions(${EXE_DEC} PRIVATE HAVE_BIGENDIAN ANY)
+endif()
+
 # Install rules
 #
 # Install executable to <prefix>/bin

app/oapv_app_enc.c

@@ -35,12 +35,6 @@
 #include "oapv_app_y4m.h"
 #include "oapv_port.h"
 
-#if defined(_WIN64) || defined(_WIN32)
-#include <winsock2.h>
-#pragma comment(lib, "ws2_32.lib")
-#else
-#include <arpa/inet.h>
-#endif
 
 #define MAX_BS_BUF   (128 * 1024 * 1024)
 #define MAX_NUM_FRMS (1)           // supports only 1-frame in an access unit
@@ -856,29 +850,28 @@ static void serialize_metadata_mdcv(const md_mdcv_t* mdcv, uint8_t* buffer) {
     uint32_t beu32_val;
 
     for (i = 0; i < 3; i++) {
-        // convert Host Byte Order na Network Byte Order (Big Endian).
-        beu16_val = htons(mdcv->primary_chromaticity_x[i]);
+        beu16_val = ne2be16(mdcv->primary_chromaticity_x[i]);
         memcpy(current_ptr, &beu16_val, sizeof(uint16_t));
         current_ptr += sizeof(uint16_t);
 
-        beu16_val = htons(mdcv->primary_chromaticity_y[i]);
+        beu16_val = ne2be16(mdcv->primary_chromaticity_y[i]);
         memcpy(current_ptr, &beu16_val, sizeof(uint16_t));
         current_ptr += sizeof(uint16_t);
     }
 
-    beu16_val = htons(mdcv->white_point_chromaticity_x);
+    beu16_val = ne2be16(mdcv->white_point_chromaticity_x);
     memcpy(current_ptr, &beu16_val, sizeof(uint16_t));
     current_ptr += sizeof(uint16_t);
 
-    beu16_val = htons(mdcv->white_point_chromaticity_y);
-    memcpy(current_ptr, &beu32_val, sizeof(uint16_t));
+    beu16_val = ne2be16(mdcv->white_point_chromaticity_y);
+    memcpy(current_ptr, &beu16_val, sizeof(uint16_t));
     current_ptr += sizeof(uint16_t);
 
-    beu32_val = htonl(mdcv->max_mastering_luminance);
+    beu32_val = ne2be32(mdcv->max_mastering_luminance);
     memcpy(current_ptr, &beu32_val, sizeof(uint32_t));
     current_ptr += sizeof(uint32_t);
 
-    beu32_val = htonl(mdcv->min_mastering_luminance);
+    beu32_val = ne2be32(mdcv->min_mastering_luminance);
     memcpy(current_ptr, &beu32_val, sizeof(uint32_t));
     current_ptr += sizeof(uint32_t);
 }
@@ -887,11 +880,11 @@ static void serialize_metadata_cll(const md_cll_t* cll, uint8_t* buffer) {
     uint8_t* current_ptr = buffer;
     uint16_t beu16_val;
 
-    beu16_val = htons(cll->max_cll);
+    beu16_val = ne2be16(cll->max_cll);
     memcpy(current_ptr, &beu16_val, sizeof(uint16_t));
     current_ptr += sizeof(uint16_t);
 
-    beu16_val = htons(cll->max_fall);
+    beu16_val = ne2be16(cll->max_fall);
     memcpy(current_ptr, &beu16_val, sizeof(uint16_t));
     current_ptr += sizeof(uint16_t);
 }

app/oapv_app_util.h

@@ -44,6 +44,7 @@
 #include <math.h>
 #include <stdarg.h>
 #include <ctype.h>
+#include <stdint.h>
 #if LINUX
 #include <signal.h>
 #include <unistd.h>
@@ -181,6 +182,71 @@ static void log_line(char *pre)
 
 static int op_verbose = VERBOSE_SIMPLE;
 
+/* Endiannes */
+#define BSWAP16(x) (((x) << 8 & 0xff00)  | ((x) >> 8 & 0x00ff))
+#define BSWAP32(x) (BSWAP16(x) << 16 | BSWAP16((x) >> 16))
+#define BSWAP64(x) (BSWAP32(x) << 32 | BSWAP32((x) >> 32))
+
+#ifndef bswap16
+static inline uint16_t bswap16(uint16_t x)
+{
+    x= (x>>8) | (x<<8);
+    return x;
+}
+#endif
+
+#ifndef bswap32
+static inline uint32_t bswap32(uint32_t x)
+{
+    return BSWAP32(x);
+}
+#endif
+
+#ifndef bswap64
+static inline uint64_t bswap64(uint64_t x)
+{
+    return (uint64_t)bswap32(x) << 32 | bswap32(x >> 32);
+}
+#endif
+
+// be2ne - big-endian to native-endian
+// le2ne - little-endian to native-endian
+// ne2be - native-endian to big-endian
+// ne2le - native-endian to little-endian
+
+#if HAVE_BIGENDIAN
+#define be2ne16(x) (x)
+#define be2ne32(x) (x)
+#define be2ne64(x) (x)
+#define le2ne16(x) bswap16(x)
+#define le2ne32(x) bswap32(x)
+#define le2ne64(x) bswap64(x)
+
+#define ne2be16(x) (x)
+#define ne2be32(x) (x)
+#define ne2be64(x) (x)
+#define ne2le16(x) bswap16(x)
+#define ne2le32(x) bswap32(x)
+#define ne2le64(x) bswap64(x)
+
+#else
+
+#define be2ne16(x) bswap16(x)
+#define be2ne32(x) bswap32(x)
+#define be2ne64(x) bswap64(x)
+#define le2ne16(x) (x)
+#define le2ne32(x) (x)
+#define le2ne64(x) (x)
+
+#define ne2be16(x) bswap16(x)
+#define ne2be32(x) bswap32(x)
+#define ne2be64(x) bswap64(x)
+#define ne2le16(x) (x)
+#define ne2le32(x) (x)
+#define ne2le64(x) (x)
+
+#endif
+
 /* Clocks */
 #if defined(_WIN64) || defined(_WIN32)
 #include <windows.h>