commit 4416f10f73cc3ab4d4a567dd28f1a3b53e0db0fa
author Atneya Nair <atneya@google.com> Mon Feb 14 17:19:30 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 14 17:19:30 2022 +0000
tree efc3d4258cbc76e12e20cef52aa73c00ef8c85c2
parent ccce02bc8dd512724868c6940eee6ec370a20dff
parent 4aba9d383f09d999e0f683468e19e246c0ea450f

Merge "Update AudioTrack/Record buffer interface"

src/jni/rtp/AudioGroup.cpp

diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp
index 7bba14d..eb3b18f 100644
--- a/src/jni/rtp/AudioGroup.cpp
+++ b/src/jni/rtp/AudioGroup.cpp
@@ -826,13 +826,13 @@
     track->setCallerName("rtp");
     record->setCallerName("rtp");
     if (track->set(AUDIO_STREAM_VOICE_CALL, sampleRate, AUDIO_FORMAT_PCM_16_BIT,
-                AUDIO_CHANNEL_OUT_MONO, output, AUDIO_OUTPUT_FLAG_NONE, NULL /*callback_t*/,
-                NULL /*user*/, 0 /*notificationFrames*/, 0 /*sharedBuffer*/,
+                AUDIO_CHANNEL_OUT_MONO, output, AUDIO_OUTPUT_FLAG_NONE, nullptr /*callback*/,
+                0 /*notificationFrames*/, 0 /*sharedBuffer*/,
                 false /*threadCanCallJava*/, AUDIO_SESSION_ALLOCATE,
                 AudioTrack::TRANSFER_OBTAIN) != NO_ERROR ||
             record->set(AUDIO_SOURCE_VOICE_COMMUNICATION, sampleRate, AUDIO_FORMAT_PCM_16_BIT,
-                AUDIO_CHANNEL_IN_MONO, input, NULL /*callback_t*/, NULL /*user*/,
-                0 /*notificationFrames*/, false /*threadCanCallJava*/, AUDIO_SESSION_ALLOCATE,
+                AUDIO_CHANNEL_IN_MONO, input, nullptr /*callback*/, 0 /*notificationFrames*/,
+                false /*threadCanCallJava*/, AUDIO_SESSION_ALLOCATE,
                 AudioRecord::TRANSFER_OBTAIN) != NO_ERROR) {
         ALOGE("cannot initialize audio device");
         return false;