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

Commit f4ebe698 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I258a4507,I78ba4ed4 

* changes:
  libaudioprocessing: Trivial dependency cleanups
  Move AudioMixer.h and BufferProviders.h into correct location
parents 067f4a21 28dd3aa4

include/media/AudioMixer.h

+1 −1
Original line number Diff line number Diff line 
../../media/libaudioclient/include/media/AudioMixer.h
 
 No newline at end of file
 
../../media/libaudioprocessing/include/media/AudioMixer.h
 
 No newline at end of file

include/media/BufferProviders.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/media/BufferProviders.h
 
 No newline at end of file
 
../../media/libaudioprocessing/include/media/BufferProviders.h
 
 No newline at end of file

media/libaudioprocessing/Android.bp

+6 −4
Original line number Diff line number Diff line
@@ -4,13 +4,9 @@ cc_defaults { 
    export_include_dirs: ["include"],



    shared_libs: [

        "libaudiohal",

        "libaudioutils",

        "libcutils",

        "liblog",

        "libnbaio",

        "libnblog",

        "libsonic",

        "libutils",

        "libvibrator",

    ],
@@ -36,6 +32,12 @@ cc_library_shared { 
        "BufferProviders.cpp",

        "RecordBufferConverter.cpp",

    ],



    shared_libs: [

        "libaudiohal",

        "libsonic",

    ],



    whole_static_libs: ["libaudioprocessing_arm"],

}

media/libaudioclient/include/media/AudioMixer.h→media/libaudioprocessing/include/media/AudioMixer.h

+0 −10
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ 


namespace android {



namespace NBLog {

class Writer;

}   // namespace NBLog



// ----------------------------------------------------------------------------



class AudioMixer
@@ -188,10 +184,6 @@ public: 
        return ss.str();

    }



    void        setNBLogWriter(NBLog::Writer *logWriter) {

        mNBLogWriter = logWriter;

    }



    static inline bool isValidFormat(audio_format_t format) {

        switch (format) {

        case AUDIO_FORMAT_PCM_8_BIT:
@@ -491,8 +483,6 @@ private: 
    const uint32_t mSampleRate;

    const size_t mFrameCount;



    NBLog::Writer *mNBLogWriter = nullptr;   // associated NBLog::Writer



    process_hook_t mHook = &AudioMixer::process__nop;   // one of process__*, never nullptr



    // the size of the type (int32_t) should be the largest of all types supported