Merge "soundpool: allocate shared memory heap by client" into klp-dev (1c7f35d1) · Commits · e / os / android_frameworks_av

include/media/IMediaPlayerService.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,12 @@ public:
		virtual sp<IMediaMetadataRetriever> createMetadataRetriever() = 0;
		virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client, int audioSessionId = 0) = 0;

		virtual sp<IMemory> decode(const char* url, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat) = 0;
		virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat) = 0;
		virtual status_t decode(const char* url, uint32_t pSampleRate, int pNumChannels,
		audio_format_t* pFormat,
		const sp<IMemoryHeap>& heap, size_t *pSize) = 0;
		virtual status_t decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate,
		int* pNumChannels, audio_format_t* pFormat,
		const sp<IMemoryHeap>& heap, size_t *pSize) = 0;
		virtual sp<IOMX> getOMX() = 0;
		virtual sp<ICrypto> makeCrypto() = 0;
		virtual sp<IDrm> makeDrm() = 0;

include/media/SoundPool.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		#include <utils/Vector.h>
		#include <utils/KeyedVector.h>
		#include <media/AudioTrack.h>
		#include <binder/MemoryHeapBase.h>
		#include <binder/MemoryBase.h>

		namespace android {

		@@ -85,6 +87,7 @@ private:
		int64_t mLength;
		char* mUrl;
		sp<IMemory> mData;
		sp<MemoryHeapBase> mHeap;
		};

		// stores pending events for stolen channels

include/media/mediaplayer.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -223,8 +223,12 @@ public:
		bool isLooping();
		status_t setVolume(float leftVolume, float rightVolume);
		void notify(int msg, int ext1, int ext2, const Parcel *obj = NULL);
		static sp<IMemory> decode(const char* url, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat);
		static sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat);
		static status_t decode(const char* url, uint32_t pSampleRate, int pNumChannels,
		audio_format_t* pFormat,
		const sp<IMemoryHeap>& heap, size_t *pSize);
		static status_t decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate,
		int* pNumChannels, audio_format_t* pFormat,
		const sp<IMemoryHeap>& heap, size_t *pSize);
		status_t invoke(const Parcel& request, Parcel *reply);
		status_t setMetadataFilter(const Parcel& filter);
		status_t getMetadata(bool update_only, bool apply_filter, Parcel *metadata);

media/libmedia/IAudioFlinger.cpp

+22 −5

Original line number	Diff line number	Diff line
		@@ -108,7 +108,12 @@ public:
		data.writeInt32(frameCount);
		track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT;
		data.writeInt32(lFlags);
		if (sharedBuffer != 0) {
		data.writeInt32(true);
		data.writeStrongBinder(sharedBuffer->asBinder());
		} else {
		data.writeInt32(false);
		}
		data.writeInt32((int32_t) output);
		data.writeInt32((int32_t) tid);
		int lSessionId = 0;
		@@ -738,15 +743,27 @@ status_t BnAudioFlinger::onTransact(
		audio_channel_mask_t channelMask = data.readInt32();
		size_t frameCount = data.readInt32();
		track_flags_t flags = (track_flags_t) data.readInt32();
		sp<IMemory> buffer = interface_cast<IMemory>(data.readStrongBinder());
		bool haveSharedBuffer = data.readInt32() != 0;
		sp<IMemory> buffer;
		if (haveSharedBuffer) {
		buffer = interface_cast<IMemory>(data.readStrongBinder());
		}
		audio_io_handle_t output = (audio_io_handle_t) data.readInt32();
		pid_t tid = (pid_t) data.readInt32();
		int sessionId = data.readInt32();
		String8 name;
		status_t status;
		sp<IAudioTrack> track = createTrack(
		sp<IAudioTrack> track;
		if ((haveSharedBuffer && (buffer == 0)) \|\|
		((buffer != 0) && (buffer->pointer() == NULL))) {
		ALOGW("CREATE_TRACK: cannot retrieve shared memory");
		status = DEAD_OBJECT;
		} else {
		track = createTrack(
		(audio_stream_type_t) streamType, sampleRate, format,
		channelMask, frameCount, &flags, buffer, output, tid, &sessionId, name, &status);
		channelMask, frameCount, &flags, buffer, output, tid,
		&sessionId, name, &status);
		}
		reply->writeInt32(flags);
		reply->writeInt32(sessionId);
		reply->writeString8(name);

media/libmedia/IMediaPlayerService.cpp

+51 −22

Original line number	Diff line number	Diff line
		@@ -86,30 +86,48 @@ public:
		return interface_cast<IMediaRecorder>(reply.readStrongBinder());
		}

		virtual sp<IMemory> decode(const char* url, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat)
		virtual status_t decode(const char* url, uint32_t pSampleRate, int pNumChannels,
		audio_format_t* pFormat,
		const sp<IMemoryHeap>& heap, size_t *pSize)
		{
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
		data.writeCString(url);
		remote()->transact(DECODE_URL, data, &reply);
		data.writeStrongBinder(heap->asBinder());
		status_t status = remote()->transact(DECODE_URL, data, &reply);
		if (status == NO_ERROR) {
		status = (status_t)reply.readInt32();
		if (status == NO_ERROR) {
		*pSampleRate = uint32_t(reply.readInt32());
		*pNumChannels = reply.readInt32();
		*pFormat = (audio_format_t)reply.readInt32();
		return interface_cast<IMemory>(reply.readStrongBinder());
		*pSize = (size_t)reply.readInt32();
		}
		}
		return status;
		}

		virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t pSampleRate, int pNumChannels, audio_format_t* pFormat)
		virtual status_t decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate,
		int* pNumChannels, audio_format_t* pFormat,
		const sp<IMemoryHeap>& heap, size_t *pSize)
		{
		Parcel data, reply;
		data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
		data.writeFileDescriptor(fd);
		data.writeInt64(offset);
		data.writeInt64(length);
		remote()->transact(DECODE_FD, data, &reply);
		data.writeStrongBinder(heap->asBinder());
		status_t status = remote()->transact(DECODE_FD, data, &reply);
		if (status == NO_ERROR) {
		status = (status_t)reply.readInt32();
		if (status == NO_ERROR) {
		*pSampleRate = uint32_t(reply.readInt32());
		*pNumChannels = reply.readInt32();
		*pFormat = (audio_format_t)reply.readInt32();
		return interface_cast<IMemory>(reply.readStrongBinder());
		*pSize = (size_t)reply.readInt32();
		}
		}
		return status;
		}

		virtual sp<IOMX> getOMX() {
		@@ -205,14 +223,19 @@ status_t BnMediaPlayerService::onTransact(
		case DECODE_URL: {
		CHECK_INTERFACE(IMediaPlayerService, data, reply);
		const char* url = data.readCString();
		sp<IMemoryHeap> heap = interface_cast<IMemoryHeap>(data.readStrongBinder());
		uint32_t sampleRate;
		int numChannels;
		audio_format_t format;
		sp<IMemory> player = decode(url, &sampleRate, &numChannels, &format);
		size_t size;
		status_t status = decode(url, &sampleRate, &numChannels, &format, heap, &size);
		reply->writeInt32(status);
		if (status == NO_ERROR) {
		reply->writeInt32(sampleRate);
		reply->writeInt32(numChannels);
		reply->writeInt32((int32_t)format);
		reply->writeStrongBinder(player->asBinder());
		reply->writeInt32((int32_t)size);
		}
		return NO_ERROR;
		} break;
		case DECODE_FD: {
		@@ -220,14 +243,20 @@ status_t BnMediaPlayerService::onTransact(
		int fd = dup(data.readFileDescriptor());
		int64_t offset = data.readInt64();
		int64_t length = data.readInt64();
		sp<IMemoryHeap> heap = interface_cast<IMemoryHeap>(data.readStrongBinder());
		uint32_t sampleRate;
		int numChannels;
		audio_format_t format;
		sp<IMemory> player = decode(fd, offset, length, &sampleRate, &numChannels, &format);
		size_t size;
		status_t status = decode(fd, offset, length, &sampleRate, &numChannels, &format,
		heap, &size);
		reply->writeInt32(status);
		if (status == NO_ERROR) {
		reply->writeInt32(sampleRate);
		reply->writeInt32(numChannels);
		reply->writeInt32((int32_t)format);
		reply->writeStrongBinder(player->asBinder());
		reply->writeInt32((int32_t)size);
		}
		return NO_ERROR;
		} break;
		case CREATE_MEDIA_RECORDER: {