New Adaptive BR algorithm, cleanups and fixes

1 files changed, 20 insertions, 45 deletions

diff --git a/toxav/audio.h b/toxav/audio.h
index 9ef10ae4..b1db7448 100644
--- a/toxav/audio.h
+++ b/toxav/audio.h
@@ -29,61 +29,36 @@
 
 #include "../toxcore/util.h"
 
-struct RTPMessage_s;
+struct RTPMessage;
 
-/*
- * Base Audio Codec session type.
- */
 typedef struct ACSession_s {
     /* encoding */
     OpusEncoder *encoder;
-    int32_t last_encoding_sampling_rate;
-    int32_t last_encoding_channel_count;
-    int32_t last_encoding_bit_rate;
-    
-    /* Testing encoder for dynamic bit rate streaming */
-    OpusEncoder *test_encoder;
-    int32_t last_test_encoding_sampling_rate;
-    int32_t last_test_encoding_channel_count;
-    int32_t last_test_encoding_bit_rate;
-    
+    int32_t le_sample_rate; /* Last encoder sample rate */
+    int32_t le_channel_count; /* Last encoder channel count */
+    int32_t le_bit_rate; /* Last encoder bit rate */
+
     /* decoding */
     OpusDecoder *decoder;
-    int32_t last_packet_channel_count;
-    int32_t last_packet_sampling_rate;
-    int32_t last_packet_frame_duration;
-    int32_t last_decoding_sampling_rate;
-    int32_t last_decoding_channel_count;
-    uint64_t last_decoder_reconfiguration;
+    int32_t lp_channel_count; /* Last packet channel count */
+    int32_t lp_sampling_rate; /* Last packet sample rate */
+    int32_t lp_frame_duration; /* Last packet frame duration */
+    int32_t ld_sample_rate; /* Last decoder sample rate */
+    int32_t ld_channel_count; /* Last decoder channel count */
+    uint64_t ldrts; /* Last decoder reconfiguration time stamp */
     void *j_buf;
-    
+
     pthread_mutex_t queue_mutex[1];
-    
-    ToxAV* av;
+
+    ToxAV *av;
     uint32_t friend_number;
     PAIR(toxav_audio_receive_frame_cb *, void *) acb; /* Audio frame receive callback */
 } ACSession;
 
-/*
- * Create new Audio Codec session.
- */
-ACSession* ac_new(ToxAV* av, uint32_t friend_number, toxav_audio_receive_frame_cb *cb, void *cb_data);
-/*
- * Kill the Audio Codec session.
- */
-void ac_kill(ACSession* ac);
-/*
- * Do periodic work. Work is consisted out of decoding only.
- */
-void ac_do(ACSession* ac);
-/*
- * Queue new rtp message.
- */
-int ac_queue_message(void *acp, struct RTPMessage_s *msg);
-/*
- * Set new values to the encoders.
- */
-int ac_reconfigure_encoder(ACSession* ac, int32_t bit_rate, int32_t sampling_rate, uint8_t channels);
-int ac_reconfigure_test_encoder(ACSession* ac, int32_t bit_rate, int32_t sampling_rate, uint8_t channels);
+ACSession *ac_new(ToxAV *av, uint32_t friend_number, toxav_audio_receive_frame_cb *cb, void *cb_data);
+void ac_kill(ACSession *ac);
+void ac_iterate(ACSession *ac);
+int ac_queue_message(void *acp, struct RTPMessage *msg);
+int ac_reconfigure_encoder(ACSession *ac, int32_t bit_rate, int32_t sampling_rate, uint8_t channels);
 
-#endif /* AUDIO_H */
\ No newline at end of file
+#endif /* AUDIO_H */