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

Commit 20d7e294 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6403403 from bba2ee66 to mainline-release 

Change-Id: I9093b5e1f5d74922081cf5ed60e1ea2afa93e9e0
parents 12479826 bba2ee66

drm/libmediadrm/DrmUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <android/hardware/drm/1.2/IDrmFactory.h>

#include <android/hardware/drm/1.3/ICryptoFactory.h>

#include <android/hardware/drm/1.3/IDrmFactory.h>

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <android/hidl/manager/1.2/IServiceManager.h>

#include <hidl/HidlSupport.h>



#include <utils/Errors.h>
@@ -41,7 +41,7 @@ 
#include <mediadrm/ICrypto.h>

#include <mediadrm/IDrm.h>



using HServiceManager = ::android::hidl::manager::V1_0::IServiceManager;

using HServiceManager = ::android::hidl::manager::V1_2::IServiceManager;

using ::android::hardware::hidl_array;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;
@@ -72,7 +72,7 @@ void MakeHidlFactories(const uint8_t uuid[16], V &factories) { 
        exit(-1);

    }



    serviceManager->listByInterface(Hal::descriptor, [&](const hidl_vec<hidl_string> &registered) {

    serviceManager->listManifestByInterface(Hal::descriptor, [&](const hidl_vec<hidl_string> &registered) {

        for (const auto &instance : registered) {

            auto factory = Hal::getService(instance);

            if (factory != nullptr) {

media/codec2/components/avc/C2SoftAvcEnc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public: 


        addParameter(

                DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE)

                .withDefault(new C2StreamPictureSizeInfo::input(0u, 320, 240))

                .withDefault(new C2StreamPictureSizeInfo::input(0u, 16, 16))

                .withFields({

                    C2F(mSize, width).inRange(2, 2560, 2),

                    C2F(mSize, height).inRange(2, 2560, 2),
@@ -129,7 +129,7 @@ public: 


        addParameter(

                DefineParam(mFrameRate, C2_PARAMKEY_FRAME_RATE)

                .withDefault(new C2StreamFrameRateInfo::output(0u, 30.))

                .withDefault(new C2StreamFrameRateInfo::output(0u, 1.))

                // TODO: More restriction?

                .withFields({C2F(mFrameRate, value).greaterThan(0.)})

                .withSetter(Setter<decltype(*mFrameRate)>::StrictValueWithNoDeps)