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

Commit 450c7b2a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ied254224,I3118af50 

* changes:
  Reland mediaswcodec: Fix "default" as preferred service
  Revert "mediaswcodec: Set "default" as preferred service"
parents 9b6ff73f 6c09c003

services/mediacodec/registrant/Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ cc_library_shared { 
        "libcodec2-hidl-defaults",

    ],

    shared_libs: [

        "android.hardware.media.c2@1.0",

        "android.hardware.media.c2@1.1",

        "libbase",

        "libcodec2_hidl@1.1",

        "libcodec2_hidl@1.0",

        "libcodec2_vndk",

        "libhidlbase",

        "libutils",

    ],



    // Codecs

services/mediacodec/registrant/CodecServiceRegistrant.cpp

+7 −9
Original line number Diff line number Diff line
@@ -22,10 +22,9 @@ 


#include <C2Component.h>

#include <C2PlatformSupport.h>

#include <codec2/hidl/1.0/ComponentStore.h>

#include <codec2/hidl/1.1/ComponentStore.h>

#include <codec2/hidl/1.0/Configurable.h>

#include <codec2/hidl/1.0/types.h>

#include <codec2/hidl/1.1/Configurable.h>

#include <codec2/hidl/1.1/types.h>

#include <hidl/HidlSupport.h>

#include <media/CodecServiceRegistrant.h>
@@ -36,8 +35,8 @@ using ::android::hardware::hidl_string; 
using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::sp;

using namespace ::android::hardware::media::c2::V1_0;

using namespace ::android::hardware::media::c2::V1_0::utils;

using namespace ::android::hardware::media::c2::V1_1;

using namespace ::android::hardware::media::c2::V1_1::utils;



constexpr c2_status_t C2_TRANSACTION_FAILED = C2_CORRUPTED;
@@ -400,11 +399,10 @@ bool ionPropertiesDefined() { 
} // unnamed namespace



extern "C" void RegisterCodecServices() {

    using ComponentStore_Latest = ::android::hardware::media::c2::V1_1::

            utils::ComponentStore;

    using namespace ::android::hardware::media::c2::V1_1;

    LOG(INFO) << "Creating software Codec2 service...";

    sp<ComponentStore_Latest> store =

        new ComponentStore_Latest(::android::GetCodec2PlatformComponentStore());

    sp<ComponentStore> store =

        new ComponentStore(::android::GetCodec2PlatformComponentStore());

    if (store == nullptr) {

        LOG(ERROR) <<

                "Cannot create software Codec2 service.";