Merge pull request #77 from Picovoice/update-pvrecorder-version

ErisMik · web-flow · commit 3d84f5ee143a · 2025-04-15T13:10:12.000-07:00
update cmake and pvrecorder versions
diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml
@@ -38,14 +38,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: ubuntu-latest
+            pv_recorder_platform: "linux"
+          - os: windows-latest
+            pv_recorder_platform: "windows-amd64"
+          - os: macos-latest
+            pv_recorder_platform: "mac-arm64"
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Create build directory
-      run: cmake -B ./build
+      run: cmake -B ./build -DPV_RECORDER_PLATFORM="${{ matrix.pv_recorder_platform }}"
 
     - name: Build micdemo
       run: cmake --build ./build --target koala_demo_mic
@@ -55,20 +62,34 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]
-        make_file: ["Unix Makefiles"]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, pv-windows-arm64]
         include:
-        - machine: pv-windows-arm64
-          make_file: "MinGW Makefiles"
-
+          - machine: rpi3-32
+            make_file: "Unix Makefiles"
+            pv_recorder_platform: "raspberry-pi3"
+          - machine: rpi3-64
+            make_file: "Unix Makefiles"
+            pv_recorder_platform: "raspberry-pi3-64"
+          - machine: rpi4-32
+            make_file: "Unix Makefiles"
+            pv_recorder_platform: "raspberry-pi4"
+          - machine: rpi4-64
+            make_file: "Unix Makefiles"
+            pv_recorder_platform: "raspberry-pi4-64"
+          - machine: rpi5-64
+            make_file: "Unix Makefiles"
+            pv_recorder_platform: "raspberry-pi5-64"
+          - machine: pv-windows-arm64
+            make_file: "MinGW Makefiles"
+            pv_recorder_platform: "windows-arm64"
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Create build directory
-      run: cmake -B ./build
+      run: cmake -B ./build -DPV_RECORDER_PLATFORM="${{ matrix.pv_recorder_platform }}"
 
     - name: Build micdemo
       run: cmake --build ./build --target koala_demo_mic
@@ -83,12 +104,15 @@ jobs:
         - os: ubuntu-latest
           platform: linux
           arch: x86_64
+          pv_recorder_platform: "linux"
         - os: windows-latest
           platform: windows
           arch: amd64
+          pv_recorder_platform: "windows-amd64"
         - os: macos-latest
           platform: mac
           arch: arm64
+          pv_recorder_platform: "mac-arm64"
 
     steps:
     - uses: actions/checkout@v3
@@ -101,7 +125,7 @@ jobs:
         python-version: '3.10'
 
     - name: Create build directory
-      run: cmake -B ./build
+      run: cmake -B ./build -DPV_RECORDER_PLATFORM="${{ matrix.pv_recorder_platform }}"
 
     - name: Build filedemo
       run: cmake --build ./build --target koala_demo_file
@@ -115,35 +139,45 @@ jobs:
     strategy:
       matrix:
         machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]
-        make_files: ["Unix Makefiles"]
         include:
         - machine: rpi3-32
           platform: raspberry-pi
           arch: cortex-a53
+          make_file: "Unix Makefiles"
+          pv_recorder_platform: "raspberry-pi3"
         - machine: rpi3-64
           platform: raspberry-pi
           arch: cortex-a53-aarch64
+          make_file: "Unix Makefiles"
+          pv_recorder_platform: "raspberry-pi3-64"
         - machine: rpi4-32
           platform: raspberry-pi
           arch: cortex-a72
+          make_file: "Unix Makefiles"
+          pv_recorder_platform: "raspberry-pi4"
         - machine: rpi4-64
           platform: raspberry-pi
           arch: cortex-a72-aarch64
+          make_file: "Unix Makefiles"
+          pv_recorder_platform: "raspberry-pi4-64"
         - machine: rpi5-64
           platform: raspberry-pi
           arch: cortex-a76-aarch64
+          make_file: "Unix Makefiles"
+          pv_recorder_platform: "raspberry-pi5-64"
         - machine: pv-windows-arm64
           platform: windows
           arch: arm64
           make_file: "MinGW Makefiles"
+          pv_recorder_platform: "windows-arm64"
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Create build directory
-      run: cmake -B ./build
+      run: cmake -B ./build -DPV_RECORDER_PLATFORM="${{ matrix.pv_recorder_platform }}"
 
     - name: Build filedemo
       run: cmake --build ./build --target koala_demo_file
diff --git a/demo/c/CMakeLists.txt b/demo/c/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.13)
 project(koala_demo_c)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_BUILD_TYPE Release)
-add_subdirectory(pvrecorder)
+add_subdirectory(pvrecorder/project)
 
 set(COMMON_LIBS dl m)
 include_directories("${PROJECT_SOURCE_DIR}/../../include")
@@ -17,7 +17,7 @@ add_executable(
         koala_demo_mic
         koala_demo_mic.c
         $<TARGET_OBJECTS:pv_recorder_object>)
-target_include_directories(koala_demo_mic PRIVATE dr_libs pvrecorder/include)
+target_include_directories(koala_demo_mic PRIVATE dr_libs pvrecorder/project/include)
 
 
 if (NOT WIN32)
diff --git a/demo/c/README.md b/demo/c/README.md
@@ -13,7 +13,7 @@ Signup or Login to [Picovoice Console](https://console.picovoice.ai/) to get you
 
 ## Requirements
 
-- The demo requires [CMake](https://cmake.org/) version 3.4 or higher.
+- The demo requires [CMake](https://cmake.org/) version 3.13 or higher.
 - **For Windows Only**: [MinGW](https://www.mingw-w64.org/) is required to build the demo.
 
 # Microphone Demo
@@ -28,9 +28,12 @@ noise suppression engine and stored in a `.wav` file.
 Use CMake to build the Koala microphone demo target:
 
 ```console
-cmake -S demo/c/ -B demo/c/build && cmake --build demo/c/build --target koala_demo_mic
+cmake -S demo/c/ -B demo/c/build -DPV_RECORDER_PLATFORM={PV_RECORDER_PLATFORM}
+cmake --build demo/c/build --target koala_demo_mic
 ```
 
+The {PV_RECORDER_PLATFORM} variable will set the compilation flags for the given platform. Exclude this variable to get a list of possible values.
+
 ## Usage
 
 Running the executable without any command-line arguments prints the usage info to the console:
@@ -70,9 +73,12 @@ linear PCM encoding.
 Use CMake to build the Koala file demo target:
 
 ```console
-cmake -S demo/c/ -B demo/c/build && cmake --build demo/c/build --target koala_demo_file
+cmake -S demo/c/ -B demo/c/build -DPV_RECORDER_PLATFORM={PV_RECORDER_PLATFORM}
+cmake --build demo/c/build --target koala_demo_file
 ```
 
+The {PV_RECORDER_PLATFORM} variable will set the compilation flags for the given platform. Exclude this variable to get a list of possible values.
+
 ## Usage
 
 Run the demo:
diff --git a/demo/c/koala_demo_mic.c b/demo/c/koala_demo_mic.c
@@ -1,5 +1,5 @@
 /*
-    Copyright 2023 Picovoice Inc.
+    Copyright 2023-2025 Picovoice Inc.
 
     You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE"
     file accompanying this source.
@@ -30,6 +30,8 @@
 
 #endif
 
+#define DR_WAV_IMPLEMENTATION
+
 #include "dr_wav.h"
 
 #include "pv_koala.h"
@@ -120,7 +122,7 @@ static void show_audio_devices(void) {
     char **devices = NULL;
     int32_t count = 0;
 
-    pv_recorder_status_t status = pv_recorder_get_audio_devices(&count, &devices);
+    pv_recorder_status_t status = pv_recorder_get_available_devices(&count, &devices);
     if (status != PV_RECORDER_STATUS_SUCCESS) {
         fprintf(stderr, "Failed to get audio devices with: %s.\n", pv_recorder_status_to_string(status));
         exit(EXIT_FAILURE);
@@ -131,7 +133,7 @@ static void show_audio_devices(void) {
         fprintf(stdout, "index: %d, name: %s\n", i, devices[i]);
     }
 
-    pv_recorder_free_device_list(count, devices);
+    pv_recorder_free_available_devices(count, devices);
 }
 
 static void print_vu_meter(const int16_t *pcm_buffer, int32_t num_samples) {
@@ -343,7 +345,7 @@ int picovoice_main(int argc, char *argv[]) {
 
     const int32_t frame_length = pv_koala_frame_length_func();
     pv_recorder_t *recorder = NULL;
-    pv_recorder_status_t recorder_status = pv_recorder_init(device_index, frame_length, 100, true, true, &recorder);
+    pv_recorder_status_t recorder_status = pv_recorder_init(frame_length, device_index, 100, &recorder);
     if (recorder_status != PV_RECORDER_STATUS_SUCCESS) {
         fprintf(stderr, "Failed to initialize device with %s.\n", pv_recorder_status_to_string(recorder_status));
         exit(EXIT_FAILURE);
diff --git a/demo/c/pvrecorder b/demo/c/pvrecorder
@@ -1 +1 @@
-Subproject commit 86f6344a76a3c3debbf6b5fb155646ac308a2833
+Subproject commit 22195152c41e62effae0fbf9dc20fa88ac37f570
