4 files changed, 38 insertions, 37 deletions

diff --git a/toxav/av_test.c b/toxav/av_test.c
index e24f0a06..d669e380 100644
--- a/toxav/av_test.c
+++ b/toxav/av_test.c
@@ -77,8 +77,8 @@
 #define TEST_REJECT 0
 #define TEST_CANCEL 0
 #define TEST_MUTE_UNMUTE 0
-#define TEST_TRANSFER_A 1
-#define TEST_TRANSFER_V 0
+#define TEST_TRANSFER_A 0
+#define TEST_TRANSFER_V 1
 
 
 typedef struct {
@@ -119,8 +119,10 @@ void* pa_write_thread (void* d)
             pthread_mutex_unlock(cc->arb_mutex);
             Pa_WriteStream(adout, f->data, f->size);
             free(f);
-        } else
+        } else {
             pthread_mutex_unlock(cc->arb_mutex);
+            c_sleep(10);
+        }
     }
 }
 
@@ -165,9 +167,9 @@ void t_toxav_call_state_cb(ToxAV *av, uint32_t friend_number, uint32_t state, vo
 //         printf("Decreasing bitrate to: %d\n", abitrate);
 //         toxav_set_audio_bit_rate(av, friend_number, abitrate, 0);
 //         
-    }
-    
-    if (state & TOXAV_CALL_STATE_INCREASE_VIDEO_BITRATE) {
+    } else if (state & TOXAV_CALL_STATE_INCREASE_VIDEO_BITRATE) {
+        
+    } else if (state & TOXAV_CALL_STATE_DECREASE_VIDEO_BITRATE) {
         
     } else {
         printf("Handling CALL STATE callback: %d\n", state);
@@ -175,7 +177,8 @@ void t_toxav_call_state_cb(ToxAV *av, uint32_t friend_number, uint32_t state, vo
 }
 void t_toxav_receive_video_frame_cb(ToxAV *av, uint32_t friend_number,
                                     uint16_t width, uint16_t height,
-                                    uint8_t const *planes[], int32_t const stride[],
+                                    uint8_t const *y, uint8_t const *u, uint8_t const *v, 
+                                    int32_t ystride, int32_t ustride, int32_t vstride,
                                     void *user_data)
 {
     uint16_t *img_data = malloc(height * width * 6);
@@ -184,13 +187,13 @@ void t_toxav_receive_video_frame_cb(ToxAV *av, uint32_t friend_number,
     for (i = 0; i < height; ++i) {
         for (j = 0; j < width; ++j) {
             uint8_t *point = (void*)img_data + 3 * ((i * width) + j);
-            int y = planes[0][(i * stride[0]) + j];
-            int u = planes[1][((i / 2) * stride[1]) + (j / 2)];
-            int v = planes[2][((i / 2) * stride[2]) + (j / 2)];
+            int yx = y[(i * ystride) + j];
+            int ux = u[((i / 2) * ustride) + (j / 2)];
+            int vx = v[((i / 2) * vstride) + (j / 2)];
             
-            point[0] = YUV2R(y, u, v);
-            point[1] = YUV2G(y, u, v);
-            point[2] = YUV2B(y, u, v);
+            point[0] = YUV2R(yx, ux, vx);
+            point[1] = YUV2G(yx, ux, vx);
+            point[2] = YUV2B(yx, ux, vx);
         }
     }
     
@@ -211,16 +214,14 @@ void t_toxav_receive_audio_frame_cb(ToxAV *av, uint32_t friend_number,
                                     uint32_t sampling_rate,
                                     void *user_data)
 {
-//     CallControl* cc = user_data;
-//     frame* f = malloc(sizeof(frame) + sample_count * sizeof(int16_t));
-//     memcpy(f->data, pcm, sample_count);
-//     f->size = sample_count/channels;
-//     
-//     pthread_mutex_lock(cc->arb_mutex);
-//     free(rb_write(cc->arb, f));
-//     pthread_mutex_unlock(cc->arb_mutex);
-    
-    Pa_WriteStream(adout, pcm, sample_count/channels);
+    CallControl* cc = user_data;
+    frame* f = malloc(sizeof(uint16_t) + sample_count * sizeof(int16_t));
+    memcpy(f->data, pcm, sample_count * sizeof(int16_t));
+    f->size = sample_count/channels;
+    
+    pthread_mutex_lock(cc->arb_mutex);
+    free(rb_write(cc->arb, f));
+    pthread_mutex_unlock(cc->arb_mutex);
 }
 void t_accept_friend_request_cb(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata)
 {
@@ -317,7 +318,7 @@ int iterate_tox(Tox* bootstrap, ToxAV* AliceAV, ToxAV* BobAV)
     return MIN(tox_iteration_interval(toxav_get_tox(AliceAV)), tox_iteration_interval(toxav_get_tox(BobAV)));
 }
 void* iterate_toxav (void * data)
-{   
+{
     struct toxav_thread_data* data_cast = data;
     
 //     cvNamedWindow(vdout, CV_WINDOW_AUTOSIZE);
@@ -327,9 +328,7 @@ void* iterate_toxav (void * data)
         toxav_iterate(data_cast->BobAV);
         int rc = MIN(toxav_iteration_interval(data_cast->AliceAV), toxav_iteration_interval(data_cast->BobAV));
         
-//         cvWaitKey(10);
-        printf("\rSleeping for: %d    ", rc);
-        fflush(stdout);
+//         cvWaitKey(rc);
         c_sleep(rc);
     }
     
@@ -751,7 +750,7 @@ int main (int argc, char** argv)
         AliceCC.arb = rb_new(16);
         BobCC.arb = rb_new(16);
         
-        AliceCC.abitrate = BobCC.abitrate = 16;
+        AliceCC.abitrate = BobCC.abitrate = 48;
         
         { /* Call */
             TOXAV_ERR_CALL rc;
@@ -803,7 +802,6 @@ int main (int argc, char** argv)
         pthread_create(&dect, NULL, iterate_toxav, &data);
         pthread_detach(dect);
         
-        
         int frame_size = (af_info.samplerate * audio_frame_duration / 1000) * af_info.channels;
         
         struct PaStreamParameters output;
@@ -819,6 +817,11 @@ int main (int argc, char** argv)
         err = Pa_StartStream(adout);
         assert(err == paNoError);
         
+        /* Start write thread */
+        pthread_t t;
+        pthread_create(&t, NULL, pa_write_thread, &BobCC);
+        pthread_detach(t);
+        
         printf("Sample rate %d\n", af_info.samplerate);
                 while ( start_time + expected_time > time(NULL) ) {
             uint64_t enc_start_time = current_time_monotonic();
@@ -833,10 +836,9 @@ int main (int argc, char** argv)
             c_sleep(abs(audio_frame_duration - (current_time_monotonic() - enc_start_time) - 1));
                 }
         
-        Pa_StopStream(adout);
-        
-                printf("Played file in: %lu\n", time(NULL) - start_time);
+                printf("Played file in: %lu; stopping stream...\n", time(NULL) - start_time);
         
+        Pa_StopStream(adout);
         sf_close(af_handle);
                 
                 { /* Hangup */
diff --git a/toxav/codec.c b/toxav/codec.c
index 95b4d406..e64c4d52 100644
--- a/toxav/codec.c
+++ b/toxav/codec.c
@@ -371,7 +371,8 @@ void cs_do(CSession *cs)
             for (; dest; dest = vpx_codec_get_frame(cs->v_decoder, &iter)) {
                 if (cs->vcb.first) 
                     cs->vcb.first(cs->av, cs->friend_id, dest->d_w, dest->d_h, 
-                                  (const uint8_t**)dest->planes, dest->stride, cs->vcb.second);
+                                  (const uint8_t*)dest->planes[0], (const uint8_t*)dest->planes[1], (const uint8_t*)dest->planes[2],
+                                  dest->stride[0], dest->stride[1], dest->stride[2], cs->vcb.second);
                 
                 vpx_img_free(dest);
             }
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 2e6326fd..01b2670d 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -250,7 +250,6 @@ void toxav_iterate(ToxAV* av)
     LOGGED_UNLOCK(av->mutex);
     
     av->interval = rc < av->dmssa ? 0 : (rc - av->dmssa);
-//     av->interval = rc < 5 ? 1: rc - 5;
     av->dmsst += current_time_monotonic() - start;
     
     if (++av->dmssc == 3) {
@@ -865,8 +864,6 @@ int callback_capabilites(void* toxav_inst, MSICall* call)
     ToxAV* toxav = toxav_inst;
     LOGGED_LOCK(toxav->mutex);
     
-    /* TODO modify cs? */
-    
     invoke_call_state(toxav, call->friend_id, call->peer_capabilities);
     
     LOGGED_UNLOCK(toxav->mutex);
diff --git a/toxav/toxav.h b/toxav/toxav.h
index 73e5a86c..0edd9024 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -500,7 +500,8 @@ bool toxav_send_audio_frame(ToxAV *av, uint32_t friend_number,
  */
 typedef void toxav_receive_video_frame_cb(ToxAV *av, uint32_t friend_number,
                                           uint16_t width, uint16_t height,
-                                          uint8_t const *planes[], int32_t const stride[],
+                                          uint8_t const *y, uint8_t const *u, uint8_t const *v, 
+                                          int32_t ystride, int32_t ustride, int32_t vstride,
                                           void *user_data);
 /**
  * Set the callback for the `receive_video_frame` event. Pass NULL to unset.