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

Commit 90a850ac authored by Ray Essick's avatar Ray Essick
Browse files

resolve merge conflicts of 76df1b46 to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ifae00252b8d90f78ccf054727ab17da37781c317
parents b85bbc05 76df1b46

media/codec2/components/aom/Android.bp

+7 −1
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libcodec2_soft_av1dec",

    name: "libcodec2_soft_av1dec_aom",

    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_all-defaults",

    ],



    // coordinated with frameworks/av/media/codec2/components/gav1/Android.bp

    // so only 1 of them has the official c2.android.av1.decoder name

    cflags: [

        "-DCODECNAME=\"c2.android.av1-aom.decoder\"",

    ],



    srcs: ["C2SoftAomDec.cpp"],

    static_libs: ["libaom"],

media/codec2/components/aom/C2SoftAomDec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 


namespace android {



constexpr char COMPONENT_NAME[] = "c2.android.av1.decoder";

// codecname set and passed in as a compile flag from Android.bp

constexpr char COMPONENT_NAME[] = CODECNAME;



class C2SoftAomDec::IntfImpl : public SimpleInterface<void>::BaseParams {

  public:

media/codec2/components/gav1/Android.bp

+7 −1
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libcodec2_soft_gav1dec",

    name: "libcodec2_soft_av1dec_gav1",

    defaults: [

        "libcodec2_soft-defaults",

        "libcodec2_soft_sanitize_all-defaults",

    ],



    // coordinated with frameworks/av/media/codec2/components/aom/Android.bp

    // so only 1 of them has the official c2.android.av1.decoder name

    cflags: [

        "-DCODECNAME=\"c2.android.av1.decoder\"",

    ],



    srcs: ["C2SoftGav1Dec.cpp"],

    static_libs: ["libgav1"],

media/codec2/components/gav1/C2SoftGav1Dec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 


namespace android {



constexpr char COMPONENT_NAME[] = "c2.android.gav1.decoder";

// codecname set and passed in as a compile flag from Android.bp

constexpr char COMPONENT_NAME[] = CODECNAME;



class C2SoftGav1Dec::IntfImpl : public SimpleInterface<void>::BaseParams {

 public:

media/codec2/vndk/C2Store.cpp

+2 −2
Original line number Diff line number Diff line
@@ -848,8 +848,8 @@ C2PlatformComponentStore::C2PlatformComponentStore() 
    emplace("libcodec2_soft_amrnbenc.so");

    emplace("libcodec2_soft_amrwbdec.so");

    emplace("libcodec2_soft_amrwbenc.so");

    emplace("libcodec2_soft_av1dec.so");

    emplace("libcodec2_soft_gav1dec.so");

    //emplace("libcodec2_soft_av1dec_aom.so"); // deprecated for the gav1 implementation

    emplace("libcodec2_soft_av1dec_gav1.so");

    emplace("libcodec2_soft_avcdec.so");

    emplace("libcodec2_soft_avcenc.so");

    emplace("libcodec2_soft_flacdec.so");