Fix CodecAPTX

Author: pschatzmann

src/AudioBasic/Int24Ex.h renamed to src/AudioBasic/Int24x.h

@@ -13,31 +13,31 @@ namespace audio_tools {
  * @copyright GPLv3
  *
  */
-class int24_t  {
+class int24x_t  {
  public:
-  int24_t() {
+  int24x_t() {
     value[0] = 0;
     value[1] = 0;
     value[2] = 0;
   }
 
-  int24_t(void *ptr) {
+  int24x_t(void *ptr) {
       memcpy(value, ptr, 3);
   }
 
-  int24_t(const int16_t &in) {
+  int24x_t(const int16_t &in) {
     value[2] = in > 0 ? 0 : 0xFF;
     value[1] = (in >> 8) & 0xFF;
     value[0] = in & 0xFF;
   }
 
-  int24_t(const int32_t &in) {
+  int24x_t(const int32_t &in) {
     set(in);
   }
 
 #if defined(STM32) || defined(ESP32C3)
 
-  int24_t(const int &in) {
+  int24x_t(const int &in) {
     set(in);
   }
 
@@ -49,12 +49,12 @@ class int24_t  {
     value[0] = in & 0xFF;
   }
 
-  int24_t& operator=(const int24_t& other){
+  int24x_t& operator=(const int24x_t& other){
     set(other);
     return *this;
   }
 
-  int24_t& operator=(const float& other){
+  int24x_t& operator=(const float& other){
     set((int32_t)other);
     return *this;
   }
@@ -63,14 +63,14 @@ class int24_t  {
     return toInt();
   }  
 
-  int24_t& operator +=(int32_t value){
+  int24x_t& operator +=(int32_t value){
     int32_t temp = toInt();
     temp += value;
     set(temp);
     return *this;
   }
 
-  int24_t& operator -=(int32_t value){
+  int24x_t& operator -=(int32_t value){
     int32_t temp = toInt();
     temp -= value;
     set(temp);

src/AudioCodecs/CodecAPTX.h

@@ -10,6 +10,7 @@
  */
 #pragma once
 #include "AudioCodecs/AudioEncoded.h"
+#include "AudioBasic/Int24x.h"
 #include "openaptx.h"
 
 /** 
@@ -105,7 +106,7 @@ class APTXDecoder : public AudioDecoder {
       int samples = written / 3;
       LOGI("written: %d", written);
       LOGI("samples: %d", samples);
-      int24_t *p_int24 = (int24_t *)output_buffer.data();
+      int24x_t *p_int24 = (int24x_t *)output_buffer.data();
       int16_t *p_int16 = (int16_t *)output_buffer.data();
       for (int j = 0; j < samples; j++) {
         p_int16[j] = p_int24[j].getAndScale16();
@@ -298,7 +299,7 @@ class APTXEncoder : public AudioEncoder {
  protected:
   bool is_hd;
   AudioInfo info;
-  Vector<int24_t> input_buffer{4 * 2};
+  Vector<int24x_t> input_buffer{4 * 2};
   Vector<uint8_t> output_buffer;
   int input_pos = 0;
   int output_pos = 0;