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

Commit cb569a99 authored by Ben Murdoch's avatar Ben Murdoch Committed by Automerger Merge Worker
Browse files

Merge "AAC: Don't fail configuration on older HALs" am: e05752e5 am: f3678488 

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

Change-Id: I4507c5638a3cd007e316aff0ca8931e6c02c54f6
parents c55bed84 f3678488

media/libstagefright/ACodec.cpp

+14 −14
Original line number Diff line number Diff line
@@ -5397,9 +5397,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
                            err = mOMXNode->getParameter(

                                    (OMX_INDEXTYPE)OMX_IndexParamAudioAndroidAacDrcPresentation,

                                    &presentation, sizeof(presentation));

                            if (err != OK) {

                                return err;

                            }

                            if (err == OK) {

                                notify->setInt32("aac-encoded-target-level",

                                                 presentation.nEncodedTargetLevel);

                                notify->setInt32("aac-drc-cut-level", presentation.nDrcCut);
@@ -5408,12 +5406,14 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
                                                 presentation.nHeavyCompression);

                                notify->setInt32("aac-target-ref-level",

                                                 presentation.nTargetReferenceLevel);

                            notify->setInt32("aac-drc-effect-type", presentation.nDrcEffectType);

                                notify->setInt32("aac-drc-effect-type",

                                                 presentation.nDrcEffectType);

                                notify->setInt32("aac-drc-album-mode", presentation.nDrcAlbumMode);

                                notify->setInt32("aac-drc-output-loudness",

                                                 presentation.nDrcOutputLoudness);

                            }

                        }

                    }

                    break;

                }