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

Commit bbc18657 authored by Cindy Zhou's avatar Cindy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Annotating createSoftOMXComponent with cfi attribute" am: 53b63994 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d7643ffae36bf5e8818178c5121c6f403878521
parents a844a659 53b63994

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1247,6 +1247,7 @@ void SoftAAC2::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp

+1 −0
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ void SoftAACEncoder2::onReset() { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ void SoftAMR::onReset() { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ void SoftAMRNBEncoder::onQueueFilled(OMX_U32 /* portIndex */) { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {

media/libstagefright/codecs/amrwbenc/SoftAMRWBEncoder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ void SoftAMRWBEncoder::onQueueFilled(OMX_U32 /* portIndex */) { 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

android::SoftOMXComponent *createSoftOMXComponent(

        const char *name, const OMX_CALLBACKTYPE *callbacks,

        OMX_PTR appData, OMX_COMPONENTTYPE **component) {