[#37] [#38] [#39] DSF: DoP 64/128/256 metadata

Author: jesperpedersen

src/CMakeLists.txt

@@ -1,74 +1,38 @@
 #
-# Add files for libpgexporter
+# Add files for hrmp
 #
 FILE(GLOB SOURCE_FILES "libhrmp/*.c")
 FILE(GLOB HEADER_FILES "include/*.h")
 
 set(SOURCES ${SOURCE_FILES} ${HEADER_FILES})
 
-#
-# OS
-#
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+add_compile_options(-DHAVE_LINUX)
+add_compile_options(-D_POSIX_C_SOURCE=200809L)
 
-  add_compile_options(-DHAVE_LINUX)
-  add_compile_options(-D_POSIX_C_SOURCE=200809L)
-
-  check_include_file("execinfo.h" HAVE_EXECINFO_H)
-  if (HAVE_EXECINFO_H)
-    add_compile_options(-DHAVE_EXECINFO_H)
-  endif()
-  #
-  # Include directories
-  #
-  include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${LIBASOUND_INCLUDE_DIRS}
-    ${LIBSNDFILE_INCLUDE_DIR}
-  )
-
-  #
-  # Library directories
-  #
-  link_libraries(
-    ${LIBATOMIC_LIBRARY}
-    ${LIBASOUND_LIBRARIES}
-    ${LIBSNDFILE_LIBRARY}
-  )
-
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+check_include_file("execinfo.h" HAVE_EXECINFO_H)
+if (HAVE_EXECINFO_H)
+  add_compile_options(-DHAVE_EXECINFO_H)
+endif()
 
-else()
+#
+# Include directories
+#
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${LIBASOUND_INCLUDE_DIRS}
+  ${LIBSNDFILE_INCLUDE_DIR}
+)
 
-  add_compile_options(-D_XOPEN_SOURCE=700)
-  add_compile_options(-D_BSD_SOURCE)
-  add_compile_options(-D_DEFAULT_SOURCE)
-  add_compile_options(-D__BSD_VISIBLE)
-
-  #
-  # Include directories
-  #
-  include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${LIBASOUND_INCLUDE_DIRS}
-    ${LIBSNDFILE_INCLUDE_DIR}
-  )
-
-  #
-  # Library directories
-  #
-  link_libraries(
-    ${LIBASOUND_LIBRARIES}
-    ${LIBSNDFILE_LIBRARY}
-  )
-
-  if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-    add_compile_options(-DHAVE_OPENBSD)
-  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-    add_compile_options(-DHAVE_FREEBSD)
-  endif()
+#
+# Library directories
+#
+link_libraries(
+  ${LIBATOMIC_LIBRARY}
+  ${LIBASOUND_LIBRARIES}
+  ${LIBSNDFILE_LIBRARY}
+)
 
-endif()
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 
 #
 # Compile options
@@ -92,12 +56,10 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
   add_compile_options(-DDEBUG)
 
   if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-      add_compile_options(-fsanitize=address)
+    add_compile_options(-fsanitize=address)
 
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fsanitize=address")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -fsanitize=address")
-    endif()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fsanitize=address")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -fsanitize=address")
   endif()
 
   check_c_compiler_flag(-fno-omit-frame-pointer HAS_NO_OMIT_FRAME_POINTER)
@@ -141,12 +103,11 @@ endif()
 check_c_compiler_flag(-fPIC HAS_PIC)
 if (HAS_PIC)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 endif()
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  include(CheckPIESupported)
-  check_pie_supported()
-endif()
+include(CheckPIESupported)
+check_pie_supported()
 
 check_c_compiler_flag(-Wl,-z,relro HAS_RELRO)
 if (HAS_RELRO)

src/include/files.h

@@ -45,6 +45,13 @@ extern "C" {
 #define TYPE_WAV     1
 #define TYPE_FLAC    2
 #define TYPE_MP3     3
+#define TYPE_DSF     4
+
+#define FORMAT_UNKNOWN 0
+#define FORMAT_16      1
+#define FORMAT_24      2
+#define FORMAT_32      3
+#define FORMAT_1       4
 
 /** @struct file_metadata
  * Defines a file metadata
@@ -53,7 +60,7 @@ struct file_metadata
 {
    int type;                     /**< The type of file */
    char name[MAX_PATH];          /**< The name of the file */
-   int format;                   /**< The format */
+   int format;                   /**< The format of the file */
    size_t file_size;             /**< The file size */
    unsigned int sample_rate;     /**< The sample rate */
    unsigned int channels;        /**< The number of channels */
@@ -62,31 +69,15 @@ struct file_metadata
    double duration;              /**< The number of seconds */
 };
 
-/**
- * Is the file supported
- * @param f The file
- * @return The result type
- */
-int
-hrmp_is_file_supported(char* f);
-
 /**
  * Get the file metadata
+ * @param device The device
  * @param f The file
  * @param fm The file metadata
- * @return The result
+ * @return The result or NULL if not supported
  */
 int
-hrmp_file_metadata(char* f, struct file_metadata** fm);
-
-/**
- * Is the file metadata supported
- * @param device The device
- * @param fm The file metadata
- * @return The result
- */
-bool
-hrmp_is_file_metadata_supported(int device, struct file_metadata* fm);
+hrmp_file_metadata(int device, char* f, struct file_metadata** fm);
 
 /**
  * Print the file metadata

src/include/utils.h

@@ -31,6 +31,7 @@
 #ifndef HRMP_UTILS_H
 #define HRMP_UTILS_H
 
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -39,8 +40,25 @@ extern "C" {
 #include <deque.h>
 
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 
+/**
+ * Read an unit64_t in little-engine format
+ * @param f The file
+ * @return The result
+ */
+uint64_t
+hrmp_read_le_u64(FILE *f);
+
+/**
+ * Read an unit32_t in little-engine format
+ * @param f The file
+ * @return The result
+ */
+uint32_t
+hrmp_read_le_u32(FILE *f);
+
 /**
  * Get the home directory of the user
  * @return The result

src/libhrmp/alsa.c

@@ -31,6 +31,7 @@
 /* hrmp */
 #include <hrmp.h>
 #include <alsa.h>
+#include <files.h>
 #include <logging.h>
 
 #include <alsa/pcm.h>
@@ -46,24 +47,26 @@ hrmp_alsa_init_handle(char* device, int format, int rate, snd_pcm_t** handle, in
    snd_pcm_uframes_t buffer_size = 0;
    snd_pcm_uframes_t period_size = 0;
    unsigned int r = (unsigned int)rate;
+   int fmt = 0;
 
    *handle = NULL;
 
-   if (format == SND_PCM_FORMAT_S16_LE)
+   if (format == FORMAT_16)
    {
       *container = 16;
+      fmt = SND_PCM_FORMAT_S16_LE;
    }
-   else if (format == SND_PCM_FORMAT_S24_3LE)
+   else if (format == FORMAT_24)
    {
       *container = 24;
+      fmt = SND_PCM_FORMAT_S24_3LE;
    }
    else
    {
-      format = SND_PCM_FORMAT_S32_LE;
+      fmt = SND_PCM_FORMAT_S32_LE;
       *container = 32;
    }
 
-   // TODO: flags - SND_PCM_NONBLOCK ?
    if ((err = snd_pcm_open(&h, device, SND_PCM_STREAM_PLAYBACK, 0)) < 0)
    {
       hrmp_log_error("snd_pcm_open %s/%s", device, snd_strerror(err));
@@ -125,13 +128,13 @@ hrmp_alsa_init_handle(char* device, int format, int rate, snd_pcm_t** handle, in
       goto error;
    }
 
-   if ((err = snd_pcm_hw_params_set_format(h, hw_params, format)) < 0)
+   if ((err = snd_pcm_hw_params_set_format(h, hw_params, fmt)) < 0)
    {
-      if (format == SND_PCM_FORMAT_S24_3LE)
+      if (fmt == SND_PCM_FORMAT_S24_3LE)
       {
-         format = SND_PCM_FORMAT_S32_LE;
+         fmt = SND_PCM_FORMAT_S32_LE;
          *container = 32;
-         if ((err = snd_pcm_hw_params_set_format(h, hw_params, format)) < 0)
+         if ((err = snd_pcm_hw_params_set_format(h, hw_params, fmt)) < 0)
          {
             hrmp_log_error("snd_pcm_hw_params_set_format %s/%s", device, snd_strerror(err));
             goto error;
@@ -169,6 +172,9 @@ hrmp_alsa_init_handle(char* device, int format, int rate, snd_pcm_t** handle, in
       snd_pcm_close(h);
    }
 
+   *handle = NULL;
+   *container = 0;
+
    return 1;
 }