diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-06 00:45:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-06 00:45:58 +0000 |
| commit | b9d5485c32a738fdeb3aab8aa7d3bc5c18b31b16 (patch) | |
| tree | 774883a9dbe2191b1fba249fbfd07feb7a5cb187 | |
| parent | 0e7559b1bfb1d7df903c529c7468c082cde92a9c (diff) | |
| parent | bb5fe023e0a20ab7f7b24e17ab326d52003d9f05 (diff) | |
| download | av-b9d5485c32a738fdeb3aab8aa7d3bc5c18b31b16.tar.gz | |
Merge changes I5e79a906,I10e49e98 into main am: bb5fe023e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2989294
Change-Id: Ia96d4e3d84ec87d65af8514e56072f8ba27cf8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/codec2/hal/common/MultiAccessUnitHelper.cpp | 2 | ||||
| -rw-r--r-- | media/codec2/sfplugin/Android.bp | 1 | ||||
| -rw-r--r-- | media/codec2/sfplugin/Codec2InfoBuilder.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/media/codec2/hal/common/MultiAccessUnitHelper.cpp b/media/codec2/hal/common/MultiAccessUnitHelper.cpp index 7c29252c9c..bcd5c37139 100644 --- a/media/codec2/hal/common/MultiAccessUnitHelper.cpp +++ b/media/codec2/hal/common/MultiAccessUnitHelper.cpp @@ -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) { diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp index 18c2468c26..4de23476f5 100644 --- a/media/codec2/sfplugin/Android.bp +++ b/media/codec2/sfplugin/Android.bp @@ -45,6 +45,7 @@ cc_library_shared { static_libs: [ "libSurfaceFlingerProperties", + "aconfig_mediacodec_flags_c_lib", "android.media.codec-aconfig-cc", ], diff --git a/media/codec2/sfplugin/Codec2InfoBuilder.cpp b/media/codec2/sfplugin/Codec2InfoBuilder.cpp index 8dce7892de..37a7a4f0b5 100644 --- a/media/codec2/sfplugin/Codec2InfoBuilder.cpp +++ b/media/codec2/sfplugin/Codec2InfoBuilder.cpp @@ -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; |