Merge branch 'feature/support_c++_compilation' into 'master'

Feature: Support for Cpp Build See merge request adf/esp-adf-libs!265
espressif · Oct 31, 2024 · be13fc6 · be13fc6
2 parents 0ae0c7d + 0cfed14
commit be13fc6
Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/esp_codec/include/codec/audio_forge.h b/esp_codec/include/codec/audio_forge.h
@@ -139,10 +139,10 @@ typedef struct {
         .source_num       = 2,                            \
         .stop_mode        = AUDIO_FORGE_STOP_MODE_AUTO,   \
     },                                                    \
-    .task_prio = AUDIO_FORGE_TASK_PRIO,                   \
-    .task_core = AUDIO_FORGE_TASK_CORE,                   \
-    .task_stack = AUDIO_FORGE_TASK_STACK,                 \
     .out_rb_size = AUDIO_FORGE_RINGBUFFER_SIZE,           \
+    .task_stack = AUDIO_FORGE_TASK_STACK,                 \
+    .task_core = AUDIO_FORGE_TASK_CORE,                   \
+    .task_prio = AUDIO_FORGE_TASK_PRIO,                   \
     .stack_in_ext = true,                                 \
 }
 

diff --git a/esp_codec/include/codec/downmix.h b/esp_codec/include/codec/downmix.h
@@ -33,10 +33,10 @@ typedef struct {
 
 #define DEFAULT_DOWNMIX_CONFIG() {                            \
     .downmix_info = {                                         \
+        .source_num  = SOURCE_NUM_MAX,                        \
         .out_ctx     = ESP_DOWNMIX_OUT_CTX_LEFT_RIGHT,        \
         .mode        = ESP_DOWNMIX_WORK_MODE_BYPASS,          \
         .output_type = ESP_DOWNMIX_OUTPUT_TYPE_ONE_CHANNEL,   \
-        .source_num  = SOURCE_NUM_MAX,                        \
     },                                                        \
     .max_sample      = DM_BUF_SIZE,                           \
     .out_rb_size     = DOWNMIX_RINGBUFFER_SIZE,               \