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

Commit d4ad23c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio: Make renamings suggested by reviewers" into main am: e8d695d9... 

Merge "audio: Make renamings suggested by reviewers" into main am: e8d695d9 am: d621a32f am: ba5b4348

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2693226



Change-Id: Ia8527711e5152fb8ba06717c2973b8cabe1e46fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 739049a2 ba5b4348

audio/aidl/default/Stream.cpp

+5 −5
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void StreamWorkerCommonLogic::populateReply(StreamDescriptor::Reply* reply, 
    if (isConnected) {

        reply->observable.frames = mContext->getFrameCount();

        reply->observable.timeNs = ::android::elapsedRealtimeNano();

        if (auto status = mDriver->getPosition(&reply->observable); status == ::android::OK) {

        if (auto status = mDriver->refinePosition(&reply->observable); status == ::android::OK) {

            return;

        }

    }
@@ -739,12 +739,12 @@ static std::map<AudioDevice, std::string> transformMicrophones( 
}  // namespace



StreamIn::StreamIn(StreamContext&& context, const std::vector<MicrophoneInfo>& microphones)

    : mContext(std::move(context)), mMicrophones(transformMicrophones(microphones)) {

    : mContextInstance(std::move(context)), mMicrophones(transformMicrophones(microphones)) {

    LOG(DEBUG) << __func__;

}



void StreamIn::defaultOnClose() {

    mContext.reset();

    mContextInstance.reset();

}



ndk::ScopedAStatus StreamIn::getActiveMicrophones(
@@ -800,12 +800,12 @@ ndk::ScopedAStatus StreamIn::setHwGain(const std::vector<float>& in_channelGains 
}



StreamOut::StreamOut(StreamContext&& context, const std::optional<AudioOffloadInfo>& offloadInfo)

    : mContext(std::move(context)), mOffloadInfo(offloadInfo) {

    : mContextInstance(std::move(context)), mOffloadInfo(offloadInfo) {

    LOG(DEBUG) << __func__;

}



void StreamOut::defaultOnClose() {

    mContext.reset();

    mContextInstance.reset();

}



ndk::ScopedAStatus StreamOut::updateOffloadMetadata(

audio/aidl/default/alsa/StreamAlsa.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ StreamAlsa::StreamAlsa(StreamContext* context, const Metadata& metadata, int rea 
    return ::android::OK;

}



::android::status_t StreamAlsa::getPosition(StreamDescriptor::Position* position) {

::android::status_t StreamAlsa::refinePosition(StreamDescriptor::Position* position) {

    if (mAlsaDeviceProxies.empty()) {

        LOG(FATAL) << __func__ << ": no input devices";

        return ::android::NO_INIT;

audio/aidl/default/bluetooth/StreamBluetooth.cpp

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ StreamInBluetooth::StreamInBluetooth(StreamContext&& context, const SinkMetadata 
                                     const std::vector<MicrophoneInfo>& microphones,

                                     Module::BtProfileHandles&& btProfileHandles)

    : StreamIn(std::move(context), microphones),

      StreamBluetooth(&(StreamIn::mContext), sinkMetadata, std::move(btProfileHandles)) {}

      StreamBluetooth(&mContextInstance, sinkMetadata, std::move(btProfileHandles)) {}



ndk::ScopedAStatus StreamInBluetooth::getActiveMicrophones(

        std::vector<MicrophoneDynamicInfo>* _aidl_return __unused) {
@@ -333,6 +333,6 @@ StreamOutBluetooth::StreamOutBluetooth(StreamContext&& context, 
                                       const std::optional<AudioOffloadInfo>& offloadInfo,

                                       Module::BtProfileHandles&& btProfileHandles)

    : StreamOut(std::move(context), offloadInfo),

      StreamBluetooth(&(StreamOut::mContext), sourceMetadata, std::move(btProfileHandles)) {}

      StreamBluetooth(&mContextInstance, sourceMetadata, std::move(btProfileHandles)) {}



}  // namespace aidl::android::hardware::audio::core

audio/aidl/default/include/core-impl/Stream.h

+4 −4
Original line number Diff line number Diff line
@@ -195,10 +195,10 @@ struct DriverInterface { 
    virtual ::android::status_t start() = 0;

    virtual ::android::status_t transfer(void* buffer, size_t frameCount, size_t* actualFrameCount,

                                         int32_t* latencyMs) = 0;

    // No need to implement 'getPosition' unless the driver can provide more precise

    // No need to implement 'refinePosition' unless the driver can provide more precise

    // data than just total frame count. For example, the driver may correctly account

    // for any intermediate buffers.

    virtual ::android::status_t getPosition(StreamDescriptor::Position* /*position*/) {

    virtual ::android::status_t refinePosition(StreamDescriptor::Position* /*position*/) {

        return ::android::OK;

    }

    virtual void shutdown() = 0;  // This function is only called once.
@@ -507,7 +507,7 @@ class StreamIn : virtual public StreamCommonInterface, public BnStreamIn { 
    StreamIn(StreamContext&& context,

             const std::vector<::aidl::android::media::audio::common::MicrophoneInfo>& microphones);



    StreamContext mContext;

    StreamContext mContextInstance;

    const std::map<::aidl::android::media::audio::common::AudioDevice, std::string> mMicrophones;

};
@@ -552,7 +552,7 @@ class StreamOut : virtual public StreamCommonInterface, public BnStreamOut { 
              const std::optional<::aidl::android::media::audio::common::AudioOffloadInfo>&

                      offloadInfo);



    StreamContext mContext;

    StreamContext mContextInstance;

    const std::optional<::aidl::android::media::audio::common::AudioOffloadInfo> mOffloadInfo;

    std::optional<::aidl::android::hardware::audio::common::AudioOffloadMetadata> mOffloadMetadata;

};

audio/aidl/default/include/core-impl/StreamAlsa.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class StreamAlsa : public StreamCommonImpl { 
    ::android::status_t start() override;

    ::android::status_t transfer(void* buffer, size_t frameCount, size_t* actualFrameCount,

                                 int32_t* latencyMs) override;

    ::android::status_t getPosition(StreamDescriptor::Position* position) override;

    ::android::status_t refinePosition(StreamDescriptor::Position* position) override;

    void shutdown() override;



  protected: