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

Commit f5e18125 authored by Eric Laurent's avatar Eric Laurent
Browse files

reorganize SoundPool and JetPlayer code. 

Reorganize SoundPool and JetPlayer code to be ready for the
creation of libmedia_native.

Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation).
Remove dependencies on nativehelper/jni.h from JetPlayer.

Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
parent 9321ad6a

include/media/JetPlayer.h

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define JETPLAYER_H_



#include <utils/threads.h>

#include <nativehelper/jni.h>



#include <libsonivox/jet.h>

#include <libsonivox/eas_types.h>
@@ -40,7 +39,7 @@ public: 
    static const int JET_NUMQUEUEDSEGMENT_UPDATE = 3;

    static const int JET_PAUSE_UPDATE            = 4;



    JetPlayer(jobject javaJetPlayer,

    JetPlayer(void *javaJetPlayer,

            int maxTracks = 32,

            int trackBufferSize = 1200);

    ~JetPlayer();
@@ -75,7 +74,7 @@ private: 


    jetevent_callback   mEventCallback;



    jobject             mJavaJetPlayerRef;

    void*               mJavaJetPlayerRef;

    Mutex               mMutex; // mutex to sync the render and playback thread with the JET calls

    pid_t               mTid;

    Condition           mCondition;

media/jni/soundpool/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	android_media_SoundPool.cpp \

	SoundPool.cpp \

	SoundPoolThread.cpp

	android_media_SoundPool.cpp



LOCAL_C_INCLUDES := \

    frameworks/base/media/libmedia



LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libutils \

	libbinder \

	libandroid_runtime \

	libnativehelper \

	libmedia \

media/jni/soundpool/android_media_SoundPool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <nativehelper/jni.h>

#include <nativehelper/JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include "SoundPool.h"

#include <SoundPool.h>



using namespace android;

media/libmedia/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ LOCAL_SRC_FILES:= \ 
    IEffectClient.cpp \

    AudioEffect.cpp \

    Visualizer.cpp \

    MemoryLeakTrackUtil.cpp

    MemoryLeakTrackUtil.cpp \

    SoundPool.cpp \

    SoundPoolThread.cpp



LOCAL_SHARED_LIBRARIES := \

	libui libcutils libutils libbinder libsonivox libicuuc libexpat \

media/libmedia/JetPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static const int MIX_NUM_BUFFERS = 4; 
static const S_EAS_LIB_CONFIG* pLibConfig = NULL;



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

JetPlayer::JetPlayer(jobject javaJetPlayer, int maxTracks, int trackBufferSize) :

JetPlayer::JetPlayer(void *javaJetPlayer, int maxTracks, int trackBufferSize) :

        mEventCallback(NULL),

        mJavaJetPlayerRef(javaJetPlayer),

        mTid(-1),