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

Commit 65881cf0 authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Automerger Merge Worker
Browse files

Merge "Put APV Codec creation under flag" into main am: 42455036 am: 88fa9e43 

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



Change-Id: I63005fe2a75497e117b0e29d1714a1aab977bc78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98799cf6 88fa9e43

media/codec2/components/apv/C2SoftApvDec.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,10 @@ class C2SoftApvDecFactory : public C2ComponentFactory { 
}  // namespace android



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

    if (!android::media::swcodec::flags::apv_software_codec()) {

        ALOGV("APV SW Codec is not enabled");

        return nullptr;

    }

    return new ::android::C2SoftApvDecFactory();

}

media/codec2/components/apv/C2SoftApvEnc.cpp

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#define LOG_TAG "C2SoftApvEnc"

#include <log/log.h>



#include <android_media_swcodec_flags.h>



#include <media/hardware/VideoAPI.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>
@@ -1267,6 +1269,10 @@ class C2SoftApvEncFactory : public C2ComponentFactory { 
}  // namespace android



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

    if (!android::media::swcodec::flags::apv_software_codec()) {

        ALOGV("APV SW Codec is not enabled");

        return nullptr;

    }

    return new ::android::C2SoftApvEncFactory();

}