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

Commit 40bdadbe authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "MP2: replace AudioSystem APIs with public ones in mediaplayer2.cpp"

parents ed98f7ae 23658641

media/libmediaplayer2/JAudioTrack.cpp

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ JAudioTrack::JAudioTrack( // < Usages of the argumen 
        callback_t cbf,                               // Offload

        void* user,                                   // Offload

        size_t frameCount,                            // bufferSizeInBytes

        audio_session_t sessionId,                    // AudioTrack

        int32_t sessionId,                    // AudioTrack

        const jobject attributes,                     // AudioAttributes

        float maxRequiredSpeed) {                     // bufferSizeInBytes
@@ -496,11 +496,11 @@ jobject JAudioTrack::getRoutedDevice() { 
    return env->CallObjectMethod(mAudioTrackObj, jGetRoutedDevice);

}



audio_session_t JAudioTrack::getAudioSessionId() {

int32_t JAudioTrack::getAudioSessionId() {

    JNIEnv *env = JavaVMHelper::getJNIEnv();

    jmethodID jGetAudioSessionId = env->GetMethodID(mAudioTrackCls, "getAudioSessionId", "()I");

    jint sessionId = env->CallIntMethod(mAudioTrackObj, jGetAudioSessionId);

    return (audio_session_t) sessionId;

    return sessionId;

}



status_t JAudioTrack::setPreferredDevice(jobject device) {

media/libmediaplayer2/MediaPlayer2AudioOutput.cpp

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ status_t MediaPlayer2AudioOutput::dump(int fd, const Vector<String16>& args) con 
    return NO_ERROR;

}



MediaPlayer2AudioOutput::MediaPlayer2AudioOutput(audio_session_t sessionId, uid_t uid, int pid,

MediaPlayer2AudioOutput::MediaPlayer2AudioOutput(int32_t sessionId, uid_t uid, int pid,

        const jobject attributes)

    : mCallback(nullptr),

      mCallbackCookie(nullptr),
@@ -623,14 +623,14 @@ void MediaPlayer2AudioOutput::CallbackWrapper( 
    data->unlock();

}



audio_session_t MediaPlayer2AudioOutput::getSessionId() const {

int32_t MediaPlayer2AudioOutput::getSessionId() const {

    Mutex::Autolock lock(mLock);

    return mSessionId;

}



void MediaPlayer2AudioOutput::setSessionId(const audio_session_t id) {

void MediaPlayer2AudioOutput::setSessionId(const int32_t sessionId) {

    Mutex::Autolock lock(mLock);

    mSessionId = id;

    mSessionId = sessionId;

}



uint32_t MediaPlayer2AudioOutput::getSampleRate() const {

media/libmediaplayer2/include/mediaplayer2/JAudioTrack.h

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public: 
                callback_t cbf,

                void* user,

                size_t frameCount = 0,

                audio_session_t sessionId  = AUDIO_SESSION_ALLOCATE,

                int32_t sessionId  = AUDIO_SESSION_ALLOCATE,

                const jobject pAttributes = NULL,

                float maxRequiredSpeed = 1.0f);
@@ -341,7 +341,7 @@ public: 
    jobject getRoutedDevice();



    /* Returns the ID of the audio session this AudioTrack belongs to. */

    audio_session_t getAudioSessionId();

    int32_t getAudioSessionId();



    /* Sets the preferred audio device to use for output of this AudioTrack.

     *

media/libmediaplayer2/include/mediaplayer2/MediaPlayer2AudioOutput.h

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class MediaPlayer2AudioOutput : public MediaPlayer2Interface::AudioSink 
    class CallbackData;



public:

    MediaPlayer2AudioOutput(audio_session_t sessionId,

    MediaPlayer2AudioOutput(int32_t sessionId,

                            uid_t uid,

                            int pid,

                            const jobject attributes);
@@ -57,8 +57,8 @@ public: 
    virtual status_t getTimestamp(AudioTimestamp &ts) const;

    virtual int64_t getPlayedOutDurationUs(int64_t nowUs) const;

    virtual status_t getFramesWritten(uint32_t *frameswritten) const;

    virtual audio_session_t getSessionId() const;

    virtual void setSessionId(const audio_session_t id);

    virtual int32_t getSessionId() const;

    virtual void setSessionId(const int32_t id);

    virtual uint32_t getSampleRate() const;

    virtual int64_t getBufferDurationInUs() const;
@@ -117,7 +117,7 @@ private: 
    uint32_t                mSampleRateHz; // sample rate of the content, as set in open()

    float                   mMsecsPerFrame;

    size_t                  mFrameSize;

    audio_session_t         mSessionId;

    int32_t                 mSessionId;

    uid_t                   mUid;

    int                     mPid;

    float                   mSendLevel;

media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Interface.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public: 
        virtual status_t getTimestamp(AudioTimestamp &ts) const = 0;

        virtual int64_t getPlayedOutDurationUs(int64_t nowUs) const = 0;

        virtual status_t getFramesWritten(uint32_t *frameswritten) const = 0;

        virtual audio_session_t getSessionId() const = 0;

        virtual int32_t getSessionId() const = 0;

        virtual audio_stream_type_t getAudioStreamType() const = 0;

        virtual uint32_t getSampleRate() const = 0;

        virtual int64_t getBufferDurationInUs() const = 0;