Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725cb1e5 authored by Phil Burk's avatar Phil Burk Committed by android-build-merger
Browse files

Merge "aaudio: apply volume in the MMAP data path" into oc-dev am: 0e69c9e2 

am: af68d9aa

Change-Id: Iadca75ce973edd758db2b649dcaef5ed47dff30d
parents b662ea6c af68d9aa

media/libaaudio/examples/write_sine/jni/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_C_INCLUDES := \

    $(call include-path-for, audio-utils) \

    frameworks/av/media/libaaudio/include

    frameworks/av/media/libaaudio/include \

    frameworks/av/media/libaaudio/src



# NDK recommends using this kind of relative path instead of an absolute path.

LOCAL_SRC_FILES:= ../src/write_sine.cpp

media/libaaudio/examples/write_sine/src/SineGenerator.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ private: 
        }

    }



    double mAmplitude = 0.005;  // unitless scaler

    double mAmplitude = 0.05;  // unitless scaler

    double mPhase = 0.0;

    double mPhaseIncrement = 440 * M_PI * 2 / 48000;

    double mFrameRate = 48000;

media/libaaudio/examples/write_sine/src/write_sine.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "SineGenerator.h"



#define SAMPLE_RATE           48000

#define NUM_SECONDS   5

#define NUM_SECONDS           15

#define NANOS_PER_MICROSECOND ((int64_t)1000)

#define NANOS_PER_MILLISECOND (NANOS_PER_MICROSECOND * 1000)

#define NANOS_PER_SECOND      (NANOS_PER_MILLISECOND * 1000)

media/libaaudio/examples/write_sine/src/write_sine_callback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <aaudio/AAudio.h>

#include "SineGenerator.h"



#define NUM_SECONDS              5

#define NUM_SECONDS              15



//#define SHARING_MODE  AAUDIO_SHARING_MODE_EXCLUSIVE

#define SHARING_MODE  AAUDIO_SHARING_MODE_SHARED

media/libaaudio/examples/write_sine/static/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := samples

LOCAL_C_INCLUDES := \

    $(call include-path-for, audio-utils) \

    frameworks/av/media/libaaudio/src \

    frameworks/av/media/libaaudio/include



# NDK recommends using this kind of relative path instead of an absolute path.