microphone initial work

Author: itsmattkc

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

lib/gamepad/audio.c

@@ -8,6 +8,8 @@
 
 #include <pthread.h>
 #include <stdint.h>
+#include <string.h>
+#include <sys/time.h>
 
 #include "gamepad.h"
 #include "vanilla.h"
@@ -35,6 +37,96 @@ typedef struct {
     uint32_t video_format;
 } AudioPacketVideoFormat;
 
+static unsigned char queued_audio[2048];
+static size_t queued_audio_start = 0;
+static size_t queued_audio_end = 0;
+static pthread_mutex_t queued_audio_mutex;
+
+int send_audio_packet(const void *data, size_t len)
+{
+    pthread_mutex_lock(&queued_audio_mutex);
+
+    for (size_t i = 0; i < len; ) {
+        size_t phys = queued_audio_end % sizeof(queued_audio);
+        size_t max_write = MIN(sizeof(queued_audio) - phys, len - i);
+        memcpy(queued_audio + phys, ((const unsigned char *) data) + i, max_write);
+        i += max_write;
+        queued_audio_end += max_write;
+    }
+
+    pthread_mutex_unlock(&queued_audio_mutex);
+    
+    return VANILLA_SUCCESS;
+}
+
+static void handle_queued_audio(gamepad_context_t *ctx, int seq_id)
+{
+    AudioPacket ap;
+
+    // Initialize payload size to zero
+    const size_t MIC_PAYLOAD_SIZE = 512;
+    ap.payload_size = 0;
+    
+    // Lock mutex
+    pthread_mutex_lock(&queued_audio_mutex);
+
+    // If available, copy over to our packet
+    if (queued_audio_end >= (queued_audio_start + MIC_PAYLOAD_SIZE)) {
+        for (size_t i = 0; i < MIC_PAYLOAD_SIZE; ) {
+            size_t phys = queued_audio_start % sizeof(queued_audio);
+            size_t max_write = MIN(sizeof(queued_audio) - phys, MIC_PAYLOAD_SIZE - i);
+            memcpy(ap.payload + i, queued_audio + queued_audio_start, max_write);
+            i += max_write;
+            queued_audio_start += max_write;
+        }
+        ap.payload_size = MIC_PAYLOAD_SIZE;
+    }
+
+    // Unlock
+    pthread_mutex_unlock(&queued_audio_mutex);
+
+    // If we didn't get audio, return here
+    if (!ap.payload_size) {
+        return;
+    }
+
+    // struct timeval tv;
+    // gettimeofday(&tv, 0);
+    // if ((tv.tv_sec % 2) == 1) {
+        // for (int i = 0; i < ap.payload_size; i++) {
+        //     ap.payload[i] = (rand() % 0xFF);
+        // }
+        // vanilla_log("NOISE!");
+    // } else {
+    //     memset(ap.payload, 0x00, ap.payload_size);
+    //     vanilla_log("...quiet...");
+    // }
+
+    // Set up remaining default parameters
+    ap.format = 6;
+    ap.mono = 1;
+    ap.vibrate = 0;
+    ap.type = TYPE_AUDIO; // Audio data
+    ap.seq_id = seq_id + 1;
+    ap.timestamp = 0;
+
+    // Reverse bits on params
+    ap.format = reverse_bits(ap.format, 3);
+    ap.seq_id = reverse_bits(ap.seq_id, 10);
+    ap.payload_size = reverse_bits(ap.payload_size, 16);//ntohs(ap.payload_size);
+    // ap.timestamp = reverse_bits(ap.timestamp, 32); // Not necessary because timestamp is 0
+
+    // Further reverse bits
+    unsigned char *bytes = (unsigned char *) &ap;
+    const size_t header_sz = sizeof(AudioPacket) - sizeof(ap.payload);
+    for (int i = 0; i < header_sz; i++) {
+        bytes[i] = (unsigned char) reverse_bits(bytes[i], 8);
+    }
+
+    // Send packet to console
+    send_to_console(ctx->socket_aud, &ap, header_sz + ap.payload_size, PORT_AUD);
+}
+
 void handle_audio_packet(gamepad_context_t *ctx, unsigned char *data, size_t len)
 {
     //
@@ -43,16 +135,16 @@ void handle_audio_packet(gamepad_context_t *ctx, unsigned char *data, size_t len
     // This for loop skips ap->format, ap->seq_id, and ap->timestamp to save processing.
     // If you want those, you'll have to adjust this loop.
     //
-    for (int byte = 0; byte < 2; byte++) {
+    for (int byte = 0; byte < 8; byte++) {
         data[byte] = (unsigned char) reverse_bits(data[byte], 8);
     }
 
     AudioPacket *ap = (AudioPacket *) data;
 
-    // ap->format = reverse_bits(ap->format, 3);
-    // ap->seq_id = reverse_bits(ap->seq_id, 10);
-    ap->payload_size = ntohs(ap->payload_size);
-    // ap->timestamp = reverse_bits(ap->timestamp, 32);
+    ap->format = reverse_bits(ap->format, 3);
+    ap->seq_id = reverse_bits(ap->seq_id, 10);
+    ap->payload_size = reverse_bits(ap->payload_size, 16);//ntohs(ap->payload_size);
+    ap->timestamp = reverse_bits(ap->timestamp, 32);
 
     if (ap->type == TYPE_VIDEO) {
         AudioPacketVideoFormat *avp = (AudioPacketVideoFormat *) ap->payload;
@@ -69,19 +161,29 @@ void handle_audio_packet(gamepad_context_t *ctx, unsigned char *data, size_t len
 
     uint8_t vibrate_val = ap->vibrate;
     push_event(ctx->event_loop, VANILLA_EVENT_VIBRATE, &vibrate_val, sizeof(vibrate_val));
+
+    handle_queued_audio(ctx, ap->seq_id);
 }
 
 void *listen_audio(void *x)
 {
     gamepad_context_t *info = (gamepad_context_t *) x;
     unsigned char data[2048];
     ssize_t size;
+
+    queued_audio_start = 0;
+    queued_audio_end = 0;
+
+    pthread_mutex_init(&queued_audio_mutex, 0);
+
     do {
         size = recv(info->socket_aud, data, sizeof(data), 0);
         if (size > 0) {
             handle_audio_packet(info, data, size);
         }
     } while (!is_interrupted());
+
+    pthread_mutex_destroy(&queued_audio_mutex);
 
     pthread_exit(NULL);
 

lib/gamepad/audio.h

@@ -1,6 +1,9 @@
 #ifndef GAMEPAD_AUDIO_H
 #define GAMEPAD_AUDIO_H
 
+#include <stddef.h>
+
 void *listen_audio(void *x);
+int send_audio_packet(const void *data, size_t len);
 
 #endif // GAMEPAD_AUDIO_H

lib/gamepad/command.c

@@ -325,6 +325,14 @@ void handle_generic_packet(gamepad_context_t *info, int skt, GenericPacket *requ
             }
             break;
         }
+        case 10:
+            response.generic_cmd_header.error_code = 0;
+            break;
+        case 11:
+            response.payload[0] = 0;
+            response.generic_cmd_header.payload_size = htons(1);
+            response.generic_cmd_header.error_code = 0;
+            break;
         }
         break;
     case SERVICE_ID_PERIPHERAL:

lib/util.c

@@ -97,4 +97,12 @@ uint32_t reverse_bits(uint32_t b, int bit_count)
 
     b >>= 32 - bit_count;
     return b;
-}
+}
+
+void print_hex(const void *data, size_t len)
+{
+    const unsigned char *c = (const unsigned char *) data;
+    for (size_t i = 0; i < len; i++) {
+        printf("%02X", c[i]);
+    }
+}

lib/util.h

@@ -24,4 +24,6 @@ unsigned int reverse_bits(unsigned int b, int bit_count);
 
 uint16_t crc16(const void* data, size_t len);
 
+void print_hex(const void *data, size_t len);
+
 #endif // VANILLA_UTIL_H

lib/vanilla.c

@@ -12,6 +12,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "gamepad/audio.h"
 #include "gamepad/command.h"
 #include "gamepad/gamepad.h"
 #include "gamepad/input.h"
@@ -231,4 +232,9 @@ size_t vanilla_generate_pps_params(void *data, size_t data_size)
 size_t vanilla_generate_h264_header(void *data, size_t size)
 {
     return generate_h264_header(data, size);
+}
+
+void vanilla_send_audio(const void *data, size_t size)
+{
+    send_audio_packet(data, size);
 }

lib/vanilla.h

@@ -193,6 +193,11 @@ void vanilla_set_battery_status(int battery_status);
  */
 size_t vanilla_generate_h264_header(void *data, size_t size);
 
+/**
+ * Send microphone audio
+ */
+void vanilla_send_audio(const void *data, size_t size);
+
 #if defined(__cplusplus)
 }
 #endif