New Adaptive BR algorithm, cleanups and fixes

1 files changed, 10 insertions, 55 deletions

diff --git a/toxav/video.h b/toxav/video.h
index ac165df6..1ad1f6f5 100644
--- a/toxav/video.h
+++ b/toxav/video.h
@@ -36,77 +36,32 @@
 
 #include "../toxcore/util.h"
 
-struct RTPMessage_s;
+struct RTPMessage;
 
-/*
- * Base Video Codec session type.
- */
 typedef struct VCSession_s {
-    
     /* encoding */
     vpx_codec_ctx_t encoder[1];
-    vpx_codec_ctx_t test_encoder[1];
     uint32_t frame_counter;
-    uint32_t test_frame_counter;
 
     /* decoding */
     vpx_codec_ctx_t decoder[1];
-    void *vbuf_raw; /* Un-decoded data */    
+    void *vbuf_raw; /* Un-decoded data */
 
-    /* Data handling */
-    uint8_t *frame_buf; /* buffer for split video payloads */
-    uint32_t frame_size; /* largest address written to in frame_buf for current input frame */
-    uint8_t  frameid_in, frameid_out; /* id of input and output video frame */
     uint64_t linfts; /* Last received frame time stamp */
     uint32_t lcfd; /* Last calculated frame duration for incoming video payload */
-    
-    /* Limits */
-    uint32_t peer_video_frame_piece_size;
 
-    /* Splitting */
-    uint8_t *split_video_frame;
-    const uint8_t *processing_video_frame;
-    uint16_t processing_video_frame_size;
-    
     ToxAV *av;
     uint32_t friend_number;
-    
+
     PAIR(toxav_video_receive_frame_cb *, void *) vcb; /* Video frame receive callback */
-    
+
     pthread_mutex_t queue_mutex[1];
 } VCSession;
 
-/*
- * Create new Video Codec session.
- */
-VCSession* vc_new(ToxAV* av, uint32_t friend_number, toxav_video_receive_frame_cb *cb, void *cb_data, uint32_t mvfpsz);
-/*
- * Kill the Video Codec session.
- */
-void vc_kill(VCSession* vc);
-/*
- * Do periodic work. Work is consisted out of decoding only.
- */
-void vc_do(VCSession* vc);
-/*
- * Set new video splitting cycle. This is requirement in order to send video packets.
- */
-void vc_init_video_splitter_cycle(VCSession* vc);
-/*
- * Update the video splitter cycle with new data.
- */
-int vc_update_video_splitter_cycle(VCSession* vc, const uint8_t* payload, uint16_t length);
-/*
- * Iterate over splitted cycle.
- */
-const uint8_t *vc_iterate_split_video_frame(VCSession* vc, uint16_t *size);
-/*
- * Queue new rtp message.
- */
-int vc_queue_message(void *vcp, struct RTPMessage_s *msg);
-/*
- * Set new values to the encoders.
- */
-int vc_reconfigure_encoder(vpx_codec_ctx_t* vccdc, uint32_t bit_rate, uint16_t width, uint16_t height);
+VCSession *vc_new(ToxAV* av, uint32_t friend_number, toxav_video_receive_frame_cb* cb, void* cb_data);
+void vc_kill(VCSession *vc);
+void vc_iterate(VCSession *vc);
+int vc_queue_message(void *vcp, struct RTPMessage *msg);
+int vc_reconfigure_encoder(vpx_codec_ctx_t *vccdc, uint32_t bit_rate, uint16_t width, uint16_t height);
 
-#endif /* VIDEO_H */
\ No newline at end of file
+#endif /* VIDEO_H */