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

Commit bb5fe023 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I5e79a906,I10e49e98 into main 

* changes:
  Fix channelCount_ nullptr check typo
  Adding both large_frame flags while signalling
parents 29e8549b bd33cedd

media/codec2/hal/common/MultiAccessUnitHelper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ C2Component::kind_t MultiAccessUnitInterface::kind() const { 


bool MultiAccessUnitInterface::getDecoderSampleRateAndChannelCount(

        uint32_t * const sampleRate_, uint32_t * const channelCount_) const {

    if (sampleRate_ == nullptr || sampleRate_ == nullptr) {

    if (sampleRate_ == nullptr || channelCount_ == nullptr) {

        return false;

    }

    if (mC2ComponentIntf) {

media/codec2/sfplugin/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ cc_library_shared { 


    static_libs: [

        "libSurfaceFlingerProperties",

        "aconfig_mediacodec_flags_c_lib",

        "android.media.codec-aconfig-cc",

    ],

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <strings.h>



#include <com_android_media_codec_flags.h>

#include <android_media_codec.h>



#include <C2Component.h>
@@ -755,7 +756,8 @@ status_t Codec2InfoBuilder::buildMediaCodecList(MediaCodecListWriter* writer) { 
                addSupportedColorFormats(

                        intf, caps.get(), trait, mediaType, it->second);



                if (android::media::codec::provider_->large_audio_frame_finish()) {

                if (com::android::media::codec::flags::provider_->large_audio_frame()

                        && android::media::codec::provider_->large_audio_frame_finish()) {

                    // Adding feature-multiple-frames when C2LargeFrame param is present

                    if (trait.domain == C2Component::DOMAIN_AUDIO) {

                        std::vector<std::shared_ptr<C2ParamDescriptor>> params;