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

Commit de7e2fdb authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "frameworks/base: Enable routing for LPA decode" 

This reverts commit 4820fe62.
parent 42d92515

include/media/AudioSystem.h

100755 → 100644
+1 −7
Original line number Diff line number Diff line
@@ -271,8 +271,7 @@ public: 
    // request to open a direct output with getOutput() (by opposition to sharing an output with other AudioTracks)

    enum output_flags {

        OUTPUT_FLAG_INDIRECT = 0x0,

        OUTPUT_FLAG_DIRECT = 0x1,

        OUTPUT_FLAG_SESSION = 0x2

        OUTPUT_FLAG_DIRECT = 0x1

    };



    // device categories used for setForceUse()
@@ -338,11 +337,6 @@ public: 
                                        uint32_t format = FORMAT_DEFAULT,

                                        uint32_t channels = CHANNEL_OUT_STEREO,

                                        output_flags flags = OUTPUT_FLAG_INDIRECT);

    static audio_io_handle_t getSession(stream_type stream,

                                        uint32_t format = FORMAT_DEFAULT,

                                        output_flags flags = OUTPUT_FLAG_DIRECT,

                                        int32_t sessionId = -1);

    static void closeSession(audio_io_handle_t output);

    static status_t startOutput(audio_io_handle_t output, AudioSystem::stream_type stream);

    static status_t stopOutput(audio_io_handle_t output, AudioSystem::stream_type stream);

    static void releaseOutput(audio_io_handle_t output);

include/media/AudioTrack.h

100755 → 100644
+0 −24
Original line number Diff line number Diff line
@@ -159,16 +159,6 @@ public: 
                                    void* user          = 0,

                                    int notificationFrames = 0);



    /* Creates an audio track and registers it with AudioFlinger. With this constructor,

     * session ID of compressed stream can be registered AudioFlinger and AudioHardware,

     * for routing purpose.

     */



                        AudioTrack( int streamType,

                                    int format          = 0,

                                    uint32_t flags      = 0,

                                    int sessionId       = -1);



    /* Terminates the AudioTrack and unregisters it from AudioFlinger.

     * Also destroys all resources assotiated with the AudioTrack.

     */
@@ -195,19 +185,6 @@ public: 
                            bool threadCanCallJava = false);





    /* Initialize an AudioTrack and registers session Id for Tunneled audio decoding.

     * Returned status (from utils/Errors.h) can be:

     *  - NO_ERROR: successful intialization

     *  - INVALID_OPERATION: AudioTrack is already intitialized

     *  - BAD_VALUE: invalid parameter (channels, format, sampleRate...)

     *  - NO_INIT: audio server or audio hardware not initialized

     * */

            status_t    set(int streamType      =-1,

                            int format          = 0,

                            uint32_t flags      = 0,

                            int sessionId       =-1);





    /* Result of constructing the AudioTrack. This must be checked

     * before using any AudioTrack API (except for set()), using

     * an uninitialized AudioTrack produces undefined results.
@@ -452,7 +429,6 @@ private: 
    uint32_t                mNewPosition;

    uint32_t                mUpdatePeriod;

    uint32_t                mFlags;

    audio_io_handle_t       mAudioSession;

};

include/media/IAudioFlinger.h

100755 → 100644
+0 −5
Original line number Diff line number Diff line
@@ -115,11 +115,6 @@ public: 
                                    uint32_t *pChannels,

                                    uint32_t *pLatencyMs,

                                    uint32_t flags) = 0;

    virtual int openSession(uint32_t *pDevices,

                                 uint32_t *pFormat,

                                 uint32_t flags,

                                 int32_t  sessionId){return 0;};

    virtual status_t closeSession(int output) = 0;

    virtual int openDuplicateOutput(int output1, int output2) = 0;

    virtual status_t closeOutput(int output) = 0;

    virtual status_t suspendOutput(int output) = 0;

include/media/IAudioPolicyService.h

100755 → 100644
+0 −5
Original line number Diff line number Diff line
@@ -53,11 +53,6 @@ public: 
                                        uint32_t format = AudioSystem::FORMAT_DEFAULT,

                                        uint32_t channels = 0,

                                        AudioSystem::output_flags flags = AudioSystem::OUTPUT_FLAG_INDIRECT) = 0;

    virtual audio_io_handle_t getSession(AudioSystem::stream_type stream,

                                        uint32_t format = AudioSystem::FORMAT_DEFAULT,

                                        AudioSystem::output_flags flags = AudioSystem::OUTPUT_FLAG_DIRECT,

                                        int32_t  sessionId=-1) {return 0;};

    virtual status_t closeSession(audio_io_handle_t output) = 0;

    virtual status_t startOutput(audio_io_handle_t output, AudioSystem::stream_type stream) = 0;

    virtual status_t stopOutput(audio_io_handle_t output, AudioSystem::stream_type stream) = 0;

    virtual void releaseOutput(audio_io_handle_t output) = 0;

include/media/MediaPlayerInterface.h

100755 → 100644
+0 −5
Original line number Diff line number Diff line
@@ -84,17 +84,12 @@ public: 
                AudioCallback cb = NULL,

                void *cookie = NULL) = 0;



        // API to open a routing session for tunneled audio playback

        virtual status_t        openSession(

                int format, int sessionId) {return 0;};



        virtual void        start() = 0;

        virtual ssize_t     write(const void* buffer, size_t size) = 0;

        virtual void        stop() = 0;

        virtual void        flush() = 0;

        virtual void        pause() = 0;

        virtual void        close() = 0;

        virtual void        closeSession() {return;};

    };



                        MediaPlayerBase() : mCookie(0), mNotify(0) {}