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

Commit 2834af3e authored by Cindy Zhou's avatar Cindy Zhou Committed by Gerrit Code Review
Browse files

Merge "Cfi function attribute for codec factory"

parents 3171fc6c f6c0c3c5

media/codec2/components/aac/C2SoftAacDec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1061,11 +1061,13 @@ private: 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

extern "C" ::C2ComponentFactory* CreateCodec2Factory() {

    ALOGV("in %s", __func__);

    return new ::android::C2SoftAacDecFactory();

}



__attribute__((cfi_canonical_jump_table))

extern "C" void DestroyCodec2Factory(::C2ComponentFactory* factory) {

    ALOGV("in %s", __func__);

    delete factory;

media/codec2/components/aac/C2SoftAacEnc.cpp

+2 −0
Original line number Diff line number Diff line
@@ -692,11 +692,13 @@ private: 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

extern "C" ::C2ComponentFactory* CreateCodec2Factory() {

    ALOGV("in %s", __func__);

    return new ::android::C2SoftAacEncFactory();

}



__attribute__((cfi_canonical_jump_table))

extern "C" void DestroyCodec2Factory(::C2ComponentFactory* factory) {

    ALOGV("in %s", __func__);

    delete factory;

media/codec2/components/amr_nb_wb/C2SoftAmrDec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -420,11 +420,13 @@ private: 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

extern "C" ::C2ComponentFactory* CreateCodec2Factory() {

    ALOGV("in %s", __func__);

    return new ::android::C2SoftAMRDecFactory();

}



__attribute__((cfi_canonical_jump_table))

extern "C" void DestroyCodec2Factory(::C2ComponentFactory* factory) {

    ALOGV("in %s", __func__);

    delete factory;

media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp

+2 −0
Original line number Diff line number Diff line
@@ -337,11 +337,13 @@ private: 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

extern "C" ::C2ComponentFactory* CreateCodec2Factory() {

    ALOGV("in %s", __func__);

    return new ::android::C2SoftAmrNbEncFactory();

}



__attribute__((cfi_canonical_jump_table))

extern "C" void DestroyCodec2Factory(::C2ComponentFactory* factory) {

    ALOGV("in %s", __func__);

    delete factory;

media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp

+2 −0
Original line number Diff line number Diff line
@@ -411,11 +411,13 @@ private: 


}  // namespace android



__attribute__((cfi_canonical_jump_table))

extern "C" ::C2ComponentFactory* CreateCodec2Factory() {

    ALOGV("in %s", __func__);

    return new ::android::C2SoftAmrWbEncFactory();

}



__attribute__((cfi_canonical_jump_table))

extern "C" void DestroyCodec2Factory(::C2ComponentFactory* factory) {

    ALOGV("in %s", __func__);

    delete factory;