4 files changed, 19 insertions, 22 deletions

diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index a3847640..abe5d034 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -66,8 +66,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 *y, uint8_t const *u, uint8_t const *v, uint8_t const *a, 
-                                    int32_t ystride, int32_t ustride, int32_t vstride, int32_t astride,
+                                    uint8_t const *y, uint8_t const *u, uint8_t const *v,
+                                    int32_t ystride, int32_t ustride, int32_t vstride,
                                     void *user_data)
 {
     (void) av;
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 761a4525..438f2789 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -61,8 +61,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 *y, uint8_t const *u, uint8_t const *v, uint8_t const *a,
-                                    int32_t ystride, int32_t ustride, int32_t vstride, int32_t 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)
 {
     (void) av;
@@ -159,13 +159,11 @@ void* call_thread(void* pd)
     uint8_t video_y[800*600];
     uint8_t video_u[800*600 / 2];
     uint8_t video_v[800*600 / 2];
-    uint8_t video_a[800*600];
     
     memset(PCM, 0, sizeof(PCM));
     memset(video_y, 0, sizeof(video_y));
     memset(video_u, 0, sizeof(video_u));
     memset(video_v, 0, sizeof(video_v));
-    memset(video_a, 0, sizeof(video_a));
     
     time_t start_time = time(NULL);
     while(time(NULL) - start_time < 4) {
@@ -175,8 +173,8 @@ void* call_thread(void* pd)
         toxav_audio_send_frame(AliceAV, friend_number, PCM, 960, 1, 48000, NULL);
         toxav_audio_send_frame(BobAV, 0, PCM, 960, 1, 48000, NULL);
         
-        toxav_video_send_frame(AliceAV, friend_number, 800, 600, video_y, video_u, video_v, video_a, NULL);
-        toxav_video_send_frame(BobAV, 0, 800, 600, video_y, video_u, video_v, video_a, NULL);
+        toxav_video_send_frame(AliceAV, friend_number, 800, 600, video_y, video_u, video_v, NULL);
+        toxav_video_send_frame(BobAV, 0, 800, 600, video_y, video_u, video_v, NULL);
         
         c_sleep(10);
     }
diff --git a/testing/av_test.c b/testing/av_test.c
index de973d91..cd9608b6 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -70,8 +70,8 @@
 #define YUV2B(Y, U, V) CLIP(( 298 * C(Y) + 516 * D(U)              + 128) >> 8)
 
 
-#define TEST_TRANSFER_A 0
-#define TEST_TRANSFER_V 1
+#define TEST_TRANSFER_A 1
+#define TEST_TRANSFER_V 0
 
 
 typedef struct {
@@ -134,14 +134,13 @@ 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 *y, uint8_t const *u, uint8_t const *v, uint8_t const *a,
-                                    int32_t ystride, int32_t ustride, int32_t vstride, int32_t astride,
+                                    uint8_t const *y, uint8_t const *u, uint8_t const *v,
+                                    int32_t ystride, int32_t ustride, int32_t vstride,
                                     void *user_data)
 {
     ystride = abs(ystride);
     ustride = abs(ustride);
     vstride = abs(vstride);
-    astride = abs(astride);
     
     uint16_t *img_data = malloc(height * width * 6);
     
@@ -177,9 +176,9 @@ void t_toxav_receive_audio_frame_cb(ToxAV *av, uint32_t friend_number,
                                     void *user_data)
 {
     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;
+    frame* f = malloc(sizeof(uint16_t) + sample_count * sizeof(int16_t) * channels);
+    memcpy(f->data, pcm, sample_count * sizeof(int16_t) * channels);
+    f->size = sample_count;
     
     pthread_mutex_lock(cc->arb_mutex);
     free(rb_write(cc->arb, f));
@@ -225,15 +224,15 @@ void initialize_tox(Tox** bootstrap, ToxAV** AliceAV, CallControl* AliceCC, ToxA
         TOX_ERR_NEW error;
         
         opts.start_port = 33445;
-        *bootstrap = tox_new(&opts, NULL, 0, &error);
+        *bootstrap = tox_new(&opts, &error);
         assert(error == TOX_ERR_NEW_OK);
         
         opts.start_port = 33455;
-        Alice = tox_new(&opts, NULL, 0, &error);
+        Alice = tox_new(&opts, &error);
         assert(error == TOX_ERR_NEW_OK);
         
         opts.start_port = 33465;
-        Bob = tox_new(&opts, NULL, 0, &error);
+        Bob = tox_new(&opts, &error);
         assert(error == TOX_ERR_NEW_OK);
     }
     
@@ -369,7 +368,7 @@ int send_opencv_img(ToxAV* av, uint32_t friend_number, const IplImage* img)
     }
     
     
-    int rc = toxav_video_send_frame(av, friend_number, img->width, img->height, planes[0], planes[1], planes[2], NULL, NULL);
+    int rc = toxav_video_send_frame(av, friend_number, img->width, img->height, planes[0], planes[1], planes[2], NULL);
     free(planes[0]);
     free(planes[1]);
     free(planes[2]);
diff --git a/toxav/audio.c b/toxav/audio.c
index f6993a1d..0a6f04e3 100644
--- a/toxav/audio.c
+++ b/toxav/audio.c
@@ -181,8 +181,8 @@ void ac_do(ACSession* ac)
         } else if (ac->acb.first) {
             ac->last_packet_frame_duration = (rc * 1000) / ac->last_packet_sampling_rate;
             
-            ac->acb.first(ac->av, ac->friend_number, tmp, rc * ac->last_packet_channel_count,
-                          ac->last_packet_channel_count, ac->last_packet_sampling_rate, ac->acb.second);
+            ac->acb.first(ac->av, ac->friend_number, tmp, rc, ac->last_packet_channel_count, 
+                          ac->last_packet_sampling_rate, ac->acb.second);
         }
         
         return;