Merge pull request TokTok#26 from zoff99/zoff99/_0.1.10_2017_video_fi…

…x_05

fixes

toxav/bwcontroller.c

@@ -89,6 +89,7 @@ BWController *bwc_new(Messenger *m, uint32_t friendnumber,
 
     return retu;
 }
+
 void bwc_kill(BWController *bwc)
 {
     if (!bwc) {
@@ -100,16 +101,17 @@ void bwc_kill(BWController *bwc)
     rb_kill(bwc->rcvpkt.rb);
     free(bwc);
 }
+
 void bwc_feed_avg(BWController *bwc, uint32_t bytes)
 {
     uint32_t *p;
     uint8_t dummy;
 
     rb_read(bwc->rcvpkt.rb, (void **) &p, &dummy);
-    rb_write(bwc->rcvpkt.rb, p, 0);
-
     *p = bytes;
+    rb_write(bwc->rcvpkt.rb, p, 0);
 }
+
 void bwc_add_lost(BWController *bwc, uint32_t bytes)
 {
     if (!bwc) {
@@ -137,6 +139,7 @@ void bwc_add_lost(BWController *bwc, uint32_t bytes)
     bwc->cycle.lost += bytes;
     send_update(bwc);
 }
+
 void bwc_add_recv(BWController *bwc, uint32_t bytes)
 {
     if (!bwc || !bytes) {
@@ -160,6 +163,7 @@ void send_update(BWController *bwc)
         bwc->cycle.lost /= 10;
         bwc->cycle.recv /= 10;
         bwc->cycle.lfu = current_time_monotonic();
+
     } else if (current_time_monotonic() - bwc->cycle.lsu > BWC_SEND_INTERVAL_MS) {
 
         if (bwc->cycle.lost) {
@@ -181,6 +185,7 @@ void send_update(BWController *bwc)
         bwc->cycle.lsu = current_time_monotonic();
     }
 }
+
 static int on_update(BWController *bwc, const struct BWCMessage *msg)
 {
     LOGGER_DEBUG(bwc->m->log, "%p Got update from peer", bwc);
@@ -199,13 +204,17 @@ static int on_update(BWController *bwc, const struct BWCMessage *msg)
     LOGGER_DEBUG(bwc->m->log, "recved: %u lost: %u", recv, lost);
 
     if (lost && bwc->mcb) {
+
+        LOGGER_DEBUG(bwc->m->log, "recved: %u lost: %u percentage: %f %", recv, lost, (float)( ((float) lost / (recv + lost)) * 100.0f) );
+
         bwc->mcb(bwc, bwc->friend_number,
                  ((float) lost / (recv + lost)),
                  bwc->mcb_data);
     }
 
     return 0;
 }
+
 int bwc_handle_data(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length, void *object)
 {
     if (length - 1 != sizeof(struct BWCMessage)) {

toxav/rtp.c

@@ -626,6 +626,10 @@ int handle_rtp_packet_v3(Messenger *m, uint32_t friendnumber, const uint8_t *dat
         return -1;
     }
 
+	// --- BWC ---
+    bwc_feed_avg(session->bwc, length);
+	// --- BWC ---
+
     // length -> includes header
     // length_v3 -> does not include header
 
@@ -681,6 +685,10 @@ int handle_rtp_packet_v3(Messenger *m, uint32_t friendnumber, const uint8_t *dat
         {
             LOGGER_DEBUG(m->log, "fill_data_into_slot.1");
 
+			// --- BWC ---
+			bwc_add_recv(session->bwc, length);
+			// --- BWC ---
+
             // fill in this part into the slot buffer at the correct offset
             uint8_t frame_complete = fill_data_into_slot(m->log, work_buffer_list, slot, is_keyframe, header_v3, length_v3, offset_v3, data, length);
 
@@ -776,6 +784,10 @@ int handle_rtp_packet_v3(Messenger *m, uint32_t friendnumber, const uint8_t *dat
         {
             LOGGER_DEBUG(m->log, "fill_data_into_slot");
 
+			// --- BWC ---
+			bwc_add_recv(session->bwc, length);
+			// --- BWC ---
+
             // fill in this part into the solt buffer at the correct offset
             uint8_t frame_complete = fill_data_into_slot(m->log, work_buffer_list, slot, is_keyframe, header_v3, length_v3, offset_v3, data, length);
 

toxav/toxav.c

@@ -880,7 +880,7 @@ bool toxav_video_send_frame(ToxAV *av, uint32_t friend_number, uint16_t width, u
                 {
                     if (keyframe == 1)
                     {
-                        frame_length_in_bytes = (1 << 31) | LOWER_31_BITS(frame_length_in_bytes);
+                        frame_length_in_bytes = (uint32_t)(1 << 31) | LOWER_31_BITS(frame_length_in_bytes);
                     }
                 }