Merge "Revert "Run codecs in a separate process"" (254012a0) · Commits · e / os / android_frameworks_av

cmds/stagefright/stagefright.cpp

+5 −6

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#include <binder/IServiceManager.h>
		#include <binder/ProcessState.h>
		#include <media/IMediaHTTPService.h>
		#include <media/IMediaCodecService.h>
		#include <media/IMediaPlayerService.h>
		#include <media/stagefright/foundation/ALooper.h>
		#include "include/NuCachedSource2.h"
		@@ -894,9 +893,9 @@ int main(int argc, char **argv) {

		if (dumpProfiles) {
		sp<IServiceManager> sm = defaultServiceManager();
		sp<IBinder> binder = sm->getService(String16("media.codec"));
		sp<IMediaCodecService> service =
		interface_cast<IMediaCodecService>(binder);
		sp<IBinder> binder = sm->getService(String16("media.player"));
		sp<IMediaPlayerService> service =
		interface_cast<IMediaPlayerService>(binder);

		CHECK(service.get() != NULL);

		@@ -908,8 +907,8 @@ int main(int argc, char **argv) {

		if (listComponents) {
		sp<IServiceManager> sm = defaultServiceManager();
		sp<IBinder> binder = sm->getService(String16("media.codec"));
		sp<IMediaCodecService> service = interface_cast<IMediaCodecService>(binder);
		sp<IBinder> binder = sm->getService(String16("media.player"));
		sp<IMediaPlayerService> service = interface_cast<IMediaPlayerService>(binder);

		CHECK(service.get() != NULL);

include/media/IMediaCodecService.h

deleted100644 → 0

+0 −45

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 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_IMEDIACODECSERVICE_H
		#define ANDROID_IMEDIACODECSERVICE_H

		#include <binder/IInterface.h>
		#include <binder/IMemory.h>
		#include <binder/Parcel.h>
		#include <media/IDataSource.h>
		#include <include/OMX.h>

		namespace android {

		class IMediaCodecService: public IInterface
		{
		public:
		DECLARE_META_INTERFACE(MediaCodecService);

		virtual sp<IOMX> getOMX() = 0;
		};

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

		} // namespace android

		#endif // ANDROID_IMEDIACODECSERVICE_H

include/media/IMediaPlayerService.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ public:
		virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client, int audioSessionId = 0)
		= 0;

		virtual sp<IOMX> getOMX() = 0;
		virtual sp<ICrypto> makeCrypto() = 0;
		virtual sp<IDrm> makeDrm() = 0;
		virtual sp<IHDCP> makeHDCP(bool createEncryptionModule) = 0;

media/libmedia/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ LOCAL_SRC_FILES:= \
		AudioSystem.cpp \
		mediaplayer.cpp \
		IMediaCodecList.cpp \
		IMediaCodecService.cpp \
		IMediaHTTPConnection.cpp \
		IMediaHTTPService.cpp \
		IMediaLogService.cpp \

media/libmedia/IMediaCodecService.cpp

deleted100644 → 0

+0 −72

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.
		*/

		#define LOG_TAG "IMediaCodecService"
		//#define LOG_NDEBUG 0

		#include <utils/Log.h>
		#include <stdint.h>
		#include <sys/types.h>
		#include <binder/Parcel.h>
		#include <media/IMediaCodecService.h>

		namespace android {

		enum {
		GET_OMX = IBinder::FIRST_CALL_TRANSACTION
		};

		class BpMediaCodecService : public BpInterface<IMediaCodecService>
		{
		public:
		BpMediaCodecService(const sp<IBinder>& impl)
		: BpInterface<IMediaCodecService>(impl)
		{
		}

		virtual sp<IOMX> getOMX() {
		Parcel data, reply;
		data.writeInterfaceToken(IMediaCodecService::getInterfaceDescriptor());
		remote()->transact(GET_OMX, data, &reply);
		return interface_cast<IOMX>(reply.readStrongBinder());
		}

		};

		IMPLEMENT_META_INTERFACE(MediaCodecService, "android.media.IMediaCodecService");

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

		status_t BnMediaCodecService::onTransact(
		uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)
		{
		switch (code) {

		case GET_OMX: {
		CHECK_INTERFACE(IMediaCodecService, data, reply);
		sp<IOMX> omx = getOMX();
		reply->writeStrongBinder(IInterface::asBinder(omx));
		return NO_ERROR;
		}
		default:
		return BBinder::onTransact(code, data, reply, flags);
		}
		}

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

		} // namespace android