summaryrefslogtreecommitdiff
path: root/toxav/codec.h
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2015-02-20 00:23:38 +0100
committermannol <eniz_vukovic@hotmail.com>2015-02-20 00:23:38 +0100
commitefe31ec92f476faffd6502714d05cce0a7dfadc7 (patch)
tree4afedbb1b005962cb10505c2446c8e5133a51dda /toxav/codec.h
parent6e259d5fcb4666ee0959ddb0bb91deace32703d4 (diff)
Removed extra msi header and started testing
Diffstat (limited to 'toxav/codec.h')
-rw-r--r--toxav/codec.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/toxav/codec.h b/toxav/codec.h
index b5eb19e2..6a673990 100644
--- a/toxav/codec.h
+++ b/toxav/codec.h
@@ -86,13 +86,12 @@ typedef struct CSSession_s {
86 86
87 /* Data handling */ 87 /* Data handling */
88 uint8_t *frame_buf; /* buffer for split video payloads */ 88 uint8_t *frame_buf; /* buffer for split video payloads */
89 uint32_t frame_size; /* largest address written to in frame_buf for current input frame*/ 89 uint32_t frame_size; /* largest address written to in frame_buf for current input frame */
90 uint8_t frameid_in, frameid_out; /* id of input and output video frame */ 90 uint8_t frameid_in, frameid_out; /* id of input and output video frame */
91 uint32_t last_timestamp; /* calculating cycles */ 91 uint32_t last_timestamp; /* calculating cycles */
92 92
93 /* Limits */ 93 /* Limits */
94 uint32_t video_frame_piece_size; 94 uint32_t peer_video_frame_piece_size;
95 uint32_t max_video_frame_size;
96 95
97 /* Splitting */ 96 /* Splitting */
98 uint8_t *split_video_frame; 97 uint8_t *split_video_frame;
@@ -129,8 +128,7 @@ typedef struct CSSession_s {
129 * 128 *
130 */ 129 */
131 void *agent; /* Pointer to ToxAV TODO make this pointer to ToxAV*/ 130 void *agent; /* Pointer to ToxAV TODO make this pointer to ToxAV*/
132 int32_t call_idx; 131 int32_t friend_id;
133 int32_t friend_number;
134 132
135 PAIR(toxav_receive_audio_frame_cb *, void *) acb; /* Audio frame receive callback */ 133 PAIR(toxav_receive_audio_frame_cb *, void *) acb; /* Audio frame receive callback */
136 PAIR(toxav_receive_video_frame_cb *, void *) vcb; /* Video frame receive callback */ 134 PAIR(toxav_receive_video_frame_cb *, void *) vcb; /* Video frame receive callback */
@@ -145,7 +143,7 @@ typedef struct CSSession_s {
145void cs_do(CSSession *cs); 143void cs_do(CSSession *cs);
146 144
147/* Make sure to be called BEFORE corresponding rtp_new */ 145/* Make sure to be called BEFORE corresponding rtp_new */
148CSSession *cs_new(uint32_t s_audio_b, uint32_t p_audio_b, uint32_t s_video_b, uint32_t p_video_b); 146CSSession *cs_new(uint32_t peer_mvfpsz);
149/* Make sure to be called AFTER corresponding rtp_kill */ 147/* Make sure to be called AFTER corresponding rtp_kill */
150void cs_kill(CSSession *cs); 148void cs_kill(CSSession *cs);
151 149