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

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

Merge changes from topic "ndk-binder" 

* changes:
  DrmSessionManager_test: remove ndk wrappers for IResourceManagerService
  convert ResourceManager usage in MediaCodec to ndk aidl
parents 15ccc647 e45ac608

media/libmedia/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ cc_library { 
        "libprocessgroup",

        "libutils",

        "libbinder",

        "libbinder_ndk",

        "libsonivox",

        "libandroidicu",

        "libexpat",
@@ -335,11 +336,11 @@ cc_library { 


    static_libs: [

        "libc_malloc_debug_backtrace", // for memory heap analysis

        "resourcemanager_aidl_interface-unstable-cpp",

        "resourcemanager_aidl_interface-ndk_platform",

    ],



    export_static_lib_headers: [

        "resourcemanager_aidl_interface-unstable-cpp",

        "resourcemanager_aidl_interface-ndk_platform",

    ],



    export_include_dirs: [

media/libmedia/MediaResource.cpp

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ MediaResource::MediaResource(Type type, SubType subType, int64_t value) { 
    this->value = value;

}



MediaResource::MediaResource(Type type, const std::vector<uint8_t> &id, int64_t value) {

MediaResource::MediaResource(Type type, const std::vector<int8_t> &id, int64_t value) {

    this->type = type;

    this->subType = SubType::kUnspecifiedSubType;

    this->id = id;
@@ -66,11 +66,11 @@ MediaResource MediaResource::VideoBatteryResource() { 
}



//static

MediaResource MediaResource::DrmSessionResource(const std::vector<uint8_t> &id, int64_t value) {

MediaResource MediaResource::DrmSessionResource(const std::vector<int8_t> &id, int64_t value) {

    return MediaResource(Type::kDrmSession, id, value);

}



static String8 bytesToHexString(const std::vector<uint8_t> &bytes) {

static String8 bytesToHexString(const std::vector<int8_t> &bytes) {

    String8 str;

    for (auto &b : bytes) {

        str.appendFormat("%02x", b);

media/libmedia/MediaResourcePolicy.cpp

+8 −7
Original line number Diff line number Diff line
@@ -16,20 +16,21 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "MediaResourcePolicy"

#include <utils/Log.h>



#include <aidl/android/media/IResourceManagerService.h>

#include <media/MediaResourcePolicy.h>

#include <android/media/IResourceManagerService.h>

#include <utils/Log.h>



namespace android {



using android::media::IResourceManagerService;

using aidl::android::media::IResourceManagerService;

//static

const ::std::string& MediaResourcePolicy::kPolicySupportsMultipleSecureCodecs() {

    return IResourceManagerService::kPolicySupportsMultipleSecureCodecs();

const char* MediaResourcePolicy::kPolicySupportsMultipleSecureCodecs() {

    return IResourceManagerService::kPolicySupportsMultipleSecureCodecs;

}

//static

const ::std::string& MediaResourcePolicy::kPolicySupportsSecureWithNonSecureCodec() {

    return IResourceManagerService::kPolicySupportsSecureWithNonSecureCodec();

const char* MediaResourcePolicy::kPolicySupportsSecureWithNonSecureCodec() {

    return IResourceManagerService::kPolicySupportsSecureWithNonSecureCodec;

}



MediaResourcePolicy::MediaResourcePolicy(

media/libmedia/include/media/MediaResource.h

+7 −6
Original line number Diff line number Diff line
@@ -18,13 +18,14 @@ 
#ifndef ANDROID_MEDIA_RESOURCE_H

#define ANDROID_MEDIA_RESOURCE_H



#include <android/media/MediaResourceParcel.h>

#include <aidl/android/media/MediaResourceParcel.h>

#include <utils/String8.h>



namespace android {



using android::media::MediaResourceParcel;

using android::media::MediaResourceSubType;

using android::media::MediaResourceType;

using aidl::android::media::MediaResourceParcel;

using aidl::android::media::MediaResourceSubType;

using aidl::android::media::MediaResourceType;



class MediaResource : public MediaResourceParcel {

public:
@@ -34,13 +35,13 @@ public: 
    MediaResource() = delete;

    MediaResource(Type type, int64_t value);

    MediaResource(Type type, SubType subType, int64_t value);

    MediaResource(Type type, const std::vector<uint8_t> &id, int64_t value);

    MediaResource(Type type, const std::vector<int8_t> &id, int64_t value);



    static MediaResource CodecResource(bool secure, bool video);

    static MediaResource GraphicMemoryResource(int64_t value);

    static MediaResource CpuBoostResource();

    static MediaResource VideoBatteryResource();

    static MediaResource DrmSessionResource(const std::vector<uint8_t> &id, int64_t value);

    static MediaResource DrmSessionResource(const std::vector<int8_t> &id, int64_t value);

};



inline static const char *asString(MediaResource::Type i, const char *def = "??") {

media/libmedia/include/media/MediaResourcePolicy.h

+5 −4
Original line number Diff line number Diff line
@@ -18,19 +18,20 @@ 
#ifndef ANDROID_MEDIA_RESOURCE_POLICY_H

#define ANDROID_MEDIA_RESOURCE_POLICY_H



#include <android/media/MediaResourcePolicyParcel.h>

#include <aidl/android/media/MediaResourcePolicyParcel.h>

#include <utils/String8.h>



namespace android {



using media::MediaResourcePolicyParcel;

using aidl::android::media::MediaResourcePolicyParcel;



class MediaResourcePolicy : public MediaResourcePolicyParcel {

public:

    MediaResourcePolicy() = delete;

    MediaResourcePolicy(const std::string& type, const std::string& value);



    static const ::std::string& kPolicySupportsMultipleSecureCodecs();

    static const ::std::string& kPolicySupportsSecureWithNonSecureCodec();

    static const char* kPolicySupportsMultipleSecureCodecs();

    static const char* kPolicySupportsSecureWithNonSecureCodec();

};



String8 toString(const MediaResourcePolicyParcel &policy);