6 files changed, 20 insertions, 0 deletions

diff --git a/toxav/BUILD.bazel b/toxav/BUILD.bazel
index dbe57b6c..f6c92b52 100644
--- a/toxav/BUILD.bazel
+++ b/toxav/BUILD.bazel
@@ -55,10 +55,16 @@ cc_test(
 )
 
 cc_library(
+    name = "pair",
+    hdrs = ["pair.h"],
+)
+
+cc_library(
     name = "audio",
     srcs = ["audio.c"],
     hdrs = ["audio.h"],
     deps = [
+        ":pair",
         ":public",
         ":rtp",
         "//c-toxcore/toxcore:network",
@@ -78,6 +84,7 @@ cc_library(
     ],
     deps = [
         ":audio",
+        ":pair",
         ":public",
         "//c-toxcore/toxcore:network",
         "@libvpx",
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index 7b788198..5f6342c0 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -16,6 +16,7 @@ libtoxav_la_SOURCES = ../toxav/rtp.h \
                     ../toxav/video.c \
                     ../toxav/bwcontroller.h \
                     ../toxav/bwcontroller.c \
+                    ../toxav/pair.h \
                     ../toxav/ring_buffer.h \
                     ../toxav/ring_buffer.c \
                     ../toxav/toxav.h \
diff --git a/toxav/audio.h b/toxav/audio.h
index 64aa2f12..39d534e0 100644
--- a/toxav/audio.h
+++ b/toxav/audio.h
@@ -24,6 +24,7 @@
 
 #include "../toxcore/logger.h"
 #include "../toxcore/util.h"
+#include "pair.h"
 
 #include <opus.h>
 #include <pthread.h>
diff --git a/toxav/pair.h b/toxav/pair.h
new file mode 100644
index 00000000..59ef2b62
--- /dev/null
+++ b/toxav/pair.h
@@ -0,0 +1,6 @@
+#ifndef C_TOXCORE_TOXAV_PAIR_H
+#define C_TOXCORE_TOXAV_PAIR_H
+
+#define PAIR(TYPE1__, TYPE2__) struct { TYPE1__ first; TYPE2__ second; }
+
+#endif // C_TOXCORE_TOXAV_PAIR_H
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 5abe1130..dcffca4d 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -242,6 +242,10 @@ void toxav_iterate(ToxAV *av)
             ac_iterate(i->audio.second);
             vc_iterate(i->video.second);
 
+            // TODO(iphydf): Find out what MIN-semantics are desired here and
+            // use a min_* function from util.h.
+#define MIN(a,b) (((a)<(b))?(a):(b))
+
             if (i->msi_call->self_capabilities & msi_CapRAudio &&
                     i->msi_call->peer_capabilities & msi_CapSAudio) {
                 rc = MIN(i->audio.second->lp_frame_duration, rc);
diff --git a/toxav/video.h b/toxav/video.h
index 616a866a..7a0913a0 100644
--- a/toxav/video.h
+++ b/toxav/video.h
@@ -24,6 +24,7 @@
 
 #include "../toxcore/logger.h"
 #include "../toxcore/util.h"
+#include "pair.h"
 
 #include <vpx/vpx_decoder.h>
 #include <vpx/vpx_encoder.h>