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

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

Merge "libaudiohal@aidl: pass offload info in hw av sync case." into main am:... 

Merge "libaudiohal@aidl: pass offload info in hw av sync case." into main am: 48adf671 am: d8398a93

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3119435



Change-Id: I6f7b8d25061b245415f6e022d094055a9e94ac78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6825e45 d8398a93

media/libaudiohal/impl/DeviceHalAidl.cpp

+5 −1
Original line number Diff line number Diff line
@@ -460,13 +460,17 @@ status_t DeviceHalAidl::openOutputStream( 
    args.portConfigId = mixPortConfig.id;

    const bool isOffload = isBitPositionFlagSet(

            aidlOutputFlags, AudioOutputFlags::COMPRESS_OFFLOAD);

    const bool isHwAvSync = isBitPositionFlagSet(

            aidlOutputFlags, AudioOutputFlags::HW_AV_SYNC);

    std::shared_ptr<OutputStreamCallbackAidl> streamCb;

    if (isOffload) {

        streamCb = ndk::SharedRefBase::make<OutputStreamCallbackAidl>(this);

    }

    auto eventCb = ndk::SharedRefBase::make<OutputStreamEventCallbackAidl>(this);

    if (isOffload) {

    if (isOffload || isHwAvSync) {

        args.offloadInfo = aidlConfig.offloadInfo;

    }

    if (isOffload) {

        args.callback = streamCb;

    }

    args.bufferSizeFrames = aidlConfig.frameCount;