Merge "media: add ResourceManagerService" (ebb80468) · Commits · e / os / android_frameworks_av

include/media/IResourceManagerClient.h

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef ANDROID_IRESOURCEMANAGERCLIENT_H
		#define ANDROID_IRESOURCEMANAGERCLIENT_H

		#include <utils/RefBase.h>
		#include <binder/IInterface.h>
		#include <binder/Parcel.h>

		namespace android {

		class IResourceManagerClient: public IInterface
		{
		public:
		DECLARE_META_INTERFACE(ResourceManagerClient);

		virtual bool reclaimResource() = 0;
		};

		// ----------------------------------------------------------------------------

		class BnResourceManagerClient: public BnInterface<IResourceManagerClient>
		{
		public:
		virtual status_t onTransact(uint32_t code,
		const Parcel &data,
		Parcel *reply,
		uint32_t flags = 0);
		};

		}; // namespace android

		#endif // ANDROID_IRESOURCEMANAGERCLIENT_H

include/media/IResourceManagerService.h

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef ANDROID_IRESOURCEMANAGERSERVICE_H
		#define ANDROID_IRESOURCEMANAGERSERVICE_H

		#include <utils/Errors.h> // for status_t
		#include <utils/KeyedVector.h>
		#include <utils/RefBase.h>
		#include <utils/String8.h>
		#include <binder/IInterface.h>
		#include <binder/Parcel.h>

		#include <media/IResourceManagerClient.h>
		#include <media/MediaResource.h>
		#include <media/MediaResourcePolicy.h>

		namespace android {

		class IResourceManagerService: public IInterface
		{
		public:
		DECLARE_META_INTERFACE(ResourceManagerService);

		virtual void config(const Vector<MediaResourcePolicy> &policies) = 0;

		virtual void addResource(
		int pid,
		int64_t clientId,
		const sp<IResourceManagerClient> client,
		const Vector<MediaResource> &resources) = 0;

		virtual void removeResource(int64_t clientId) = 0;

		virtual bool reclaimResource(
		int callingPid,
		const Vector<MediaResource> &resources) = 0;
		};

		// ----------------------------------------------------------------------------

		class BnResourceManagerService: public BnInterface<IResourceManagerService>
		{
		public:
		virtual status_t onTransact(uint32_t code,
		const Parcel &data,
		Parcel *reply,
		uint32_t flags = 0);
		};

		}; // namespace android

		#endif // ANDROID_IRESOURCEMANAGERSERVICE_H

include/media/MediaResource.h

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/


		#ifndef ANDROID_MEDIA_RESOURCE_H
		#define ANDROID_MEDIA_RESOURCE_H

		#include <binder/Parcel.h>
		#include <utils/String8.h>

		namespace android {

		extern const char kResourceSecureCodec[];
		extern const char kResourceNonSecureCodec[];
		extern const char kResourceGraphicMemory[];

		class MediaResource {
		public:
		MediaResource();
		MediaResource(String8 type, uint64_t value);
		MediaResource(String8 type, String8 subType, uint64_t value);

		void readFromParcel(const Parcel &parcel);
		void writeToParcel(Parcel *parcel) const;

		String8 toString() const;

		bool operator==(const MediaResource &other) const;
		bool operator!=(const MediaResource &other) const;

		String8 mType;
		String8 mSubType;
		uint64_t mValue;
		};

		}; // namespace android

		#endif // ANDROID_MEDIA_RESOURCE_H

include/media/MediaResourcePolicy.h

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/


		#ifndef ANDROID_MEDIA_RESOURCE_POLICY_H
		#define ANDROID_MEDIA_RESOURCE_POLICY_H

		#include <binder/Parcel.h>
		#include <utils/String8.h>

		namespace android {

		extern const char kPolicySupportsMultipleSecureCodecs[];
		extern const char kPolicySupportsSecureWithNonSecureCodec[];

		class MediaResourcePolicy {
		public:
		MediaResourcePolicy();
		MediaResourcePolicy(String8 type, uint64_t value);

		void readFromParcel(const Parcel &parcel);
		void writeToParcel(Parcel *parcel) const;

		String8 toString() const;

		String8 mType;
		uint64_t mValue;
		};

		}; // namespace android

		#endif // ANDROID_MEDIA_RESOURCE_POLICY_H

media/libmedia/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ LOCAL_SRC_FILES:= \
		IMediaRecorder.cpp \
		IRemoteDisplay.cpp \
		IRemoteDisplayClient.cpp \
		IResourceManagerClient.cpp \
		IResourceManagerService.cpp \
		IStreamSource.cpp \
		MediaCodecInfo.cpp \
		Metadata.cpp \
		@@ -53,6 +55,8 @@ LOCAL_SRC_FILES:= \
		CharacterEncodingDetector.cpp \
		IMediaDeathNotifier.cpp \
		MediaProfiles.cpp \
		MediaResource.cpp \
		MediaResourcePolicy.cpp \
		IEffect.cpp \
		IEffectClient.cpp \
		AudioEffect.cpp \