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

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

audio policy: add client descriptors 

Add client descriptors to keep track of opened AudioTrack and
AudioRecord individualy. Client descriptor contains audio attributes,
sampling rate, format, channels, uid, session, preferred route etc...

Test: make.

Change-Id: I785bdf7548670769f463549a3245114ac4c86e41
parent 3fcfb3c0

services/audiopolicy/common/managerdefinitions/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ LOCAL_SRC_FILES:= \ 
    src/AudioSourceDescriptor.cpp \

    src/VolumeCurve.cpp \

    src/TypeConverter.cpp \

    src/AudioSession.cpp

    src/AudioSession.cpp \

    src/ClientDescriptor.cpp



LOCAL_SHARED_LIBRARIES := \

    libcutils \

services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#pragma once



#include <sys/types.h>



#include "AudioPort.h"

#include <RoutingStrategy.h>

#include <utils/Errors.h>

services/audiopolicy/common/managerdefinitions/include/ClientDescriptor.h

0 → 100644
+101 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <unistd.h>

#include <sys/types.h>



#include <system/audio.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>



namespace android {



class ClientDescriptor: public RefBase

{

public:

    ClientDescriptor(audio_port_handle_t portId, uid_t uid, audio_session_t sessionId,

                   audio_attributes_t attributes, audio_config_base_t config,

                   audio_port_handle_t preferredDeviceId) :

        mPortId(portId), mUid(uid), mSessionId(sessionId), mAttributes(attributes),

        mConfig(config), mPreferredDeviceId(preferredDeviceId), mActive(false) {}

    ~ClientDescriptor() override = default;



    virtual status_t  dump(int fd);



    audio_port_handle_t portId() const { return mPortId; }

    uid_t uid() const { return mUid; }

    audio_session_t session() const { return mSessionId; };

    audio_attributes_t attributes() const { return mAttributes; }

    audio_config_base_t config() const { return mConfig; }

    audio_port_handle_t preferredDeviceId() const { return mPreferredDeviceId; };

    void setActive(bool active) { mActive = active; }

    bool active() const { return mActive; }



private:

    const audio_port_handle_t mPortId;  // unique Id for this client

    const uid_t mUid;                     // client UID

    const audio_session_t mSessionId;       // audio session ID

    const audio_attributes_t mAttributes; // usage...

    const audio_config_base_t mConfig;

    const audio_port_handle_t mPreferredDeviceId;  // selected input device port ID

          bool mActive;

};



class TrackClientDescriptor: public ClientDescriptor

{

public:

    TrackClientDescriptor(audio_port_handle_t portId, uid_t uid, audio_session_t sessionId,

                   audio_attributes_t attributes, audio_config_base_t config,

                   audio_port_handle_t preferredDeviceId,

                   audio_stream_type_t stream, audio_output_flags_t flags) :

        ClientDescriptor(portId, uid, sessionId, attributes, config, preferredDeviceId),

        mStream(stream), mFlags(flags) {}

    ~TrackClientDescriptor() override = default;



    status_t    dump(int fd) override;



    audio_output_flags_t flags() const { return mFlags; }

    audio_stream_type_t stream() const { return mStream; }



private:

    const audio_stream_type_t mStream;

    const audio_output_flags_t mFlags;

};



class RecordClientDescriptor: public ClientDescriptor

{

public:

    RecordClientDescriptor(audio_port_handle_t portId, uid_t uid, audio_session_t sessionId,

                        audio_attributes_t attributes, audio_config_base_t config,

                        audio_port_handle_t preferredDeviceId,

                        audio_source_t source, audio_input_flags_t flags) :

        ClientDescriptor(portId, uid, sessionId, attributes, config, preferredDeviceId),

        mSource(source), mFlags(flags) {}

    ~RecordClientDescriptor() override = default;



    status_t    dump(int fd) override;



    audio_source_t source() const { return mSource; }

    audio_input_flags_t flags() const { return mFlags; }



private:

    const audio_source_t mSource;

    const audio_input_flags_t mFlags;

};



} // namespace android

services/audiopolicy/common/managerdefinitions/src/ClientDescriptor.cpp

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define LOG_TAG "APM_ClientDescriptor"

//#define LOG_NDEBUG 0



#include <utils/String8.h>

#include "ClientDescriptor.h"



namespace android {



status_t ClientDescriptor::dump(int fd)

{

    const size_t SIZE = 256;

    char buffer[SIZE];

    String8 result;



    snprintf(buffer, SIZE, " Port ID: %d Session Id: %d UID: %d\n", mPortId, mSessionId, mUid);

    result.append(buffer);

    snprintf(buffer, SIZE, " Format: %08x Sampling rate: %d Channels: %08x\n",

             mConfig.format, mConfig.sample_rate, mConfig.channel_mask);

    result.append(buffer);

    snprintf(buffer, SIZE, " Preferred Device Id: %08x\n", mPreferredDeviceId);

    result.append(buffer);

    snprintf(buffer, SIZE, " State: %s\n", mActive ? "Active" : "Inactive");

    result.append(buffer);



    write(fd, result.string(), result.size());



    return NO_ERROR;

}



status_t TrackClientDescriptor::dump(int fd)

{

    ClientDescriptor::dump(fd);



    const size_t SIZE = 256;

    char buffer[SIZE];

    String8 result;



    snprintf(buffer, SIZE, " Stream: %d flags: %08x\n", mStream, mFlags);

    result.append(buffer);



    write(fd, result.string(), result.size());



    return NO_ERROR;

}



status_t RecordClientDescriptor::dump(int fd)

{

    ClientDescriptor::dump(fd);



    const size_t SIZE = 256;

    char buffer[SIZE];

    String8 result;



    snprintf(buffer, SIZE, " Source: %d flags: %08x\n", mSource, mFlags);

    result.append(buffer);



    write(fd, result.string(), result.size());



    return NO_ERROR;

}



}; //namespace android