Move dead submodules in-tree

Signed-off-by: swurl <swurl@swurl.xyz>

externals/oboe/samples/MegaDrone/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+
+### INCLUDE OBOE LIBRARY ###
+
+# Set the path to the Oboe library directory
+set (OBOE_DIR ../../../../..)
+
+# Add the Oboe library as a subproject. Since Oboe is an out-of-tree source library we must also
+# specify a binary directory
+add_subdirectory(${OBOE_DIR} ./oboe-bin)
+
+# Include the Oboe headers
+include_directories(${OBOE_DIR}/include ${OBOE_DIR}/samples/shared ${OBOE_DIR}/samples/debug-utils)
+
+
+### END OBOE INCLUDE SECTION ###
+
+add_library( megadrone SHARED
+        native-lib.cpp
+        MegaDroneEngine.cpp
+        )
+
+target_link_libraries(megadrone log oboe )
+target_link_options(megadrone PRIVATE "-Wl,-z,max-page-size=16384")
+
+# Enable optimization flags: if having problems with source level debugging,
+# disable -Ofast ( and debug ), re-enable it after done debugging.
+target_compile_options(megadrone PRIVATE -Wall -Werror -Ofast)

externals/oboe/samples/MegaDrone/src/main/cpp/MegaDroneEngine.cpp

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <memory>
+#include "MegaDroneEngine.h"
+
+/**
+ * Main audio engine for the MegaDrone sample. It is responsible for:
+ *
+ * - Creating the callback object which will be supplied when constructing the audio stream
+ * - Setting the CPU core IDs to which the callback thread should bind to
+ * - Creating the playback stream, including setting the callback object
+ * - Creating `Synth` which will render the audio inside the callback
+ * - Starting the playback stream
+ * - Restarting the playback stream when `restart()` is called by the callback object
+ *
+ * @param cpuIds
+ */
+MegaDroneEngine::MegaDroneEngine(std::vector<int> cpuIds) {
+    createCallback(cpuIds);
+}
+
+MegaDroneEngine::~MegaDroneEngine() {
+    if (mStream) {
+        LOGE("MegaDroneEngine destructor was called without calling stop()."
+             "Please call stop() to ensure stream resources are not leaked.");
+        stop();
+    }
+}
+
+void MegaDroneEngine::tap(bool isDown) {
+    mAudioSource->tap(isDown);
+}
+
+void MegaDroneEngine::restart() {
+    stop();
+    start();
+}
+// Create the playback stream
+oboe::Result MegaDroneEngine::createPlaybackStream() {
+    oboe::AudioStreamBuilder builder;
+    return builder.setSharingMode(oboe::SharingMode::Exclusive)
+            ->setPerformanceMode(oboe::PerformanceMode::LowLatency)
+            ->setFormat(oboe::AudioFormat::Float)
+            ->setDataCallback(mDataCallback)
+            ->setErrorCallback(mErrorCallback)
+            ->openStream(mStream);
+}
+
+// Create the callback and set its thread affinity to the supplied CPU core IDs
+void MegaDroneEngine::createCallback(std::vector<int> cpuIds){
+
+    mDataCallback = std::make_shared<DefaultDataCallback>();
+
+    // Create the error callback, we supply ourselves as the parent so that we can restart the stream
+    // when it's disconnected
+    mErrorCallback = std::make_shared<DefaultErrorCallback>(*this);
+
+    // Bind the audio callback to specific CPU cores as this can help avoid underruns caused by
+    // core migrations
+    mDataCallback->setCpuIds(cpuIds);
+    mDataCallback->setThreadAffinityEnabled(true);
+}
+
+bool MegaDroneEngine::start() {
+    // It is possible for a stream's device to become disconnected during stream open or between
+    // stream open and stream start.
+    // If the stream fails to start, close the old stream and try again.
+    bool didStart = false;
+    int tryCount = 0;
+    do {
+        if (tryCount > 0) {
+            usleep(20 * 1000); // Sleep between tries to give the system time to settle.
+        }
+        didStart = attemptStart();
+    } while (!didStart && tryCount++ < 3);
+    if (!didStart) {
+        LOGE("Failed at starting the stream");
+    }
+    return didStart;
+}
+
+bool MegaDroneEngine::attemptStart() {
+    auto result = createPlaybackStream();
+
+    if (result == Result::OK) {
+        // Create our synthesizer audio source using the properties of the stream
+        mAudioSource = std::make_shared<Synth>(mStream->getSampleRate(), mStream->getChannelCount());
+        mDataCallback->reset();
+        mDataCallback->setSource(std::dynamic_pointer_cast<IRenderableAudio>(mAudioSource));
+        result = mStream->start();
+        if (result == Result::OK) {
+            return true;
+        } else {
+            LOGW("Failed attempt at starting the playback stream. Error: %s", convertToText(result));
+            return false;
+        }
+    } else {
+        LOGW("Failed attempt at creating the playback stream. Error: %s", convertToText(result));
+        return false;
+    }
+}
+
+bool MegaDroneEngine::stop() {
+    if(mStream && mStream->getState() != oboe::StreamState::Closed) {
+        mStream->stop();
+        mStream->close();
+    }
+    mStream.reset();
+    return true;
+}
+

externals/oboe/samples/MegaDrone/src/main/cpp/MegaDroneEngine.h

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MEGADRONE_ENGINE_H
+#define MEGADRONE_ENGINE_H
+
+
+#include <oboe/Oboe.h>
+#include <vector>
+
+#include "Synth.h"
+#include <DefaultDataCallback.h>
+#include <TappableAudioSource.h>
+#include <IRestartable.h>
+#include <DefaultErrorCallback.h>
+
+using namespace oboe;
+
+class MegaDroneEngine : public IRestartable {
+
+public:
+    MegaDroneEngine(std::vector<int> cpuIds);
+
+    virtual ~MegaDroneEngine();
+
+    void tap(bool isDown);
+
+    // from IRestartable
+    virtual void restart() override;
+
+    bool start();
+    bool stop();
+
+private:
+    std::shared_ptr<AudioStream> mStream;
+    std::shared_ptr<TappableAudioSource> mAudioSource;
+    std::shared_ptr<DefaultDataCallback> mDataCallback;
+    std::shared_ptr<DefaultErrorCallback> mErrorCallback;
+
+    bool attemptStart();
+    oboe::Result createPlaybackStream();
+    void createCallback(std::vector<int> cpuIds);
+};
+
+
+#endif //MEGADRONE_ENGINE_H

externals/oboe/samples/MegaDrone/src/main/cpp/Synth.h

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MEGADRONE_SYNTH_H
+#define MEGADRONE_SYNTH_H
+
+#include <array>
+#include <TappableAudioSource.h>
+
+#include <Oscillator.h>
+#include <Mixer.h>
+#include <MonoToStereo.h>
+
+constexpr int kNumOscillators = 100;
+constexpr float kOscBaseFrequency = 116.0;
+constexpr float kOscDivisor = 33;
+constexpr float kOscAmplitude = 0.009;
+
+
+class Synth : public TappableAudioSource {
+public:
+
+    Synth(int32_t sampleRate, int32_t channelCount) :
+    TappableAudioSource(sampleRate, channelCount) {
+        for (int i = 0; i < kNumOscillators; ++i) {
+            mOscs[i].setSampleRate(mSampleRate);
+            mOscs[i].setFrequency(kOscBaseFrequency + (static_cast<float>(i) / kOscDivisor));
+            mOscs[i].setAmplitude(kOscAmplitude);
+            mMixer.addTrack(&mOscs[i]);
+        }
+        if (mChannelCount == oboe::ChannelCount::Stereo) {
+            mOutputStage =  &mConverter;
+        } else {
+            mOutputStage = &mMixer;
+        }
+    }
+
+    void tap(bool isOn) override {
+        for (auto &osc : mOscs) osc.setWaveOn(isOn);
+    };
+
+    // From IRenderableAudio
+    void renderAudio(float *audioData, int32_t numFrames) override {
+        mOutputStage->renderAudio(audioData, numFrames);
+    };
+
+    virtual ~Synth() {
+    }
+private:
+    // Rendering objects
+    std::array<Oscillator, kNumOscillators> mOscs;
+    Mixer mMixer;
+    MonoToStereo mConverter = MonoToStereo(&mMixer);
+    IRenderableAudio *mOutputStage; // This will point to either the mixer or converter, so it needs to be raw
+};
+
+
+#endif //MEGADRONE_SYNTH_H

externals/oboe/samples/MegaDrone/src/main/cpp/native-lib.cpp

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <jni.h>
+#include <string>
+#include <vector>
+
+#include "MegaDroneEngine.h"
+
+
+std::vector<int> convertJavaArrayToVector(JNIEnv *env, jintArray intArray) {
+    std::vector<int> v;
+    jsize length = env->GetArrayLength(intArray);
+    if (length > 0) {
+        jint *elements = env->GetIntArrayElements(intArray, nullptr);
+        v.insert(v.end(), &elements[0], &elements[length]);
+        // Unpin the memory for the array, or free the copy.
+        env->ReleaseIntArrayElements(intArray, elements, 0);
+    }
+    return v;
+}
+
+extern "C" {
+/**
+ * Start the audio engine
+ *
+ * @param env
+ * @param instance
+ * @param jCpuIds - CPU core IDs which the audio process should affine to
+ * @return a pointer to the audio engine. This should be passed to other methods
+ */
+JNIEXPORT jlong JNICALL
+Java_com_google_oboe_samples_megadrone_MainActivity_startEngine(JNIEnv *env, jobject /*unused*/,
+                                                         jintArray jCpuIds) {
+    std::vector<int> cpuIds = convertJavaArrayToVector(env, jCpuIds);
+    LOGD("cpu ids size: %d", static_cast<int>(cpuIds.size()));
+    MegaDroneEngine  *engine = new MegaDroneEngine(std::move(cpuIds));
+
+    if (!engine->start()) {
+        LOGE("Failed to start MegaDrone Engine");
+        delete engine;
+        engine = nullptr;
+    } else  {
+        LOGD("Engine Started");
+    }
+    return reinterpret_cast<jlong>(engine);
+}
+
+JNIEXPORT void JNICALL
+Java_com_google_oboe_samples_megadrone_MainActivity_stopEngine(JNIEnv *env, jobject instance,
+        jlong jEngineHandle) {
+    auto engine = reinterpret_cast<MegaDroneEngine*>(jEngineHandle);
+    if (engine) {
+        engine->stop();
+        delete engine;
+    } else {
+        LOGD("Engine invalid, call startEngine() to create");
+    }
+}
+
+
+JNIEXPORT void JNICALL
+Java_com_google_oboe_samples_megadrone_MainActivity_tap(JNIEnv *env, jobject instance,
+        jlong jEngineHandle, jboolean isDown) {
+
+    auto *engine = reinterpret_cast<MegaDroneEngine*>(jEngineHandle);
+    if (engine) {
+        engine->tap(isDown);
+    } else {
+        LOGE("Engine handle is invalid, call createEngine() to create a new one");
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_google_oboe_samples_megadrone_MainActivity_native_1setDefaultStreamValues(JNIEnv *env,
+                                                                            jclass type,
+                                                                            jint sampleRate,
+                                                                            jint framesPerBurst) {
+    oboe::DefaultStreamValues::SampleRate = (int32_t) sampleRate;
+    oboe::DefaultStreamValues::FramesPerBurst = (int32_t) framesPerBurst;
+}
+
+} // extern "C"